diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-04-15 22:45:06 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-04-15 22:45:06 +0100 |
| commit | 512633ef44c0edb025aa5302e35ed9829a6d8502 (patch) | |
| tree | 5486d59422a8088b70d7802f601103e7b116f7e8 /CHANGES.rst | |
| parent | Merge branch 'master' of https://github.com/matrix-org/synapse into develop (diff) | |
| download | synapse-512633ef44c0edb025aa5302e35ed9829a6d8502.tar.xz | |
fix spurious changelog dup
Diffstat (limited to 'CHANGES.rst')
| -rw-r--r-- | CHANGES.rst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 19b7af606b..c1ba8c75ce 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -61,7 +61,6 @@ Bug fixes: * Add room_id to the response of `rooms/{roomId}/join` (PR #2986) Thanks to @jplatte! * Fix replication after switch to simplejson (PR #3015) -* Fix replication after switch to simplejson (PR #3015) * 404 correctly on missing paths via NoResource (PR #3022) * Fix error when claiming e2e keys from offline servers (PR #3034) * fix tests/storage/test_user_directory.py (PR #3042) |