diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-09 11:40:37 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-09 11:40:37 +0100 |
| commit | a5ef1107490a8f581e8baf8a29d509826b8d2490 (patch) | |
| tree | 24dcb2ae7813a421d04b6faa3a00c8ec646a7bef /changelog.d/3571.misc | |
| parent | sync auth blocking (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-a5ef1107490a8f581e8baf8a29d509826b8d2490.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block
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 |