diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2018-07-23 10:03:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 10:03:28 +0100 |
| commit | 9b34f3ea3af233d70412565290468092cf3c5984 (patch) | |
| tree | dcfc00333a843cdc3a011249ef78f8438804dbd4 /changelog.d/3571.misc | |
| parent | add trailing comma (diff) | |
| parent | Make the rest of the .iterwhatever go away (#3562) (diff) | |
| download | synapse-9b34f3ea3af233d70412565290468092cf3c5984.tar.xz | |
Merge branch 'develop' into matthew/sync_deleted_devices
Diffstat (limited to 'changelog.d/3571.misc')
| -rw-r--r-- | changelog.d/3571.misc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/3571.misc b/changelog.d/3571.misc new file mode 100644 index 0000000000..8908324e68 --- /dev/null +++ b/changelog.d/3571.misc @@ -0,0 +1 @@ +Merge Linearizer and Limiter |