diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-17 14:15:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-17 14:15:48 +0100 |
| commit | 782689bd408b7d291fef913a318e1a6dda6f13e1 (patch) | |
| tree | 50502568cd0b9966e8c42d48d8db5d6cdf73fe1c /changelog.d/3571.misc | |
| parent | Split ProfileHandler into master and worker (diff) | |
| parent | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff) | |
| download | synapse-782689bd408b7d291fef913a318e1a6dda6f13e1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_profiles
Diffstat (limited to 'changelog.d/3571.misc')
| -rw-r--r-- | changelog.d/3571.misc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/3571.misc b/changelog.d/3571.misc deleted file mode 100644 index 8908324e68..0000000000 --- a/changelog.d/3571.misc +++ /dev/null @@ -1 +0,0 @@ -Merge Linearizer and Limiter |