diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-09-27 15:18:21 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-09-27 15:18:21 +0100 |
commit | f094f715cff95a7cebcbd984dbaccf3f1d81615e (patch) | |
tree | 0ffd3f4c45b8b50481713e87a226abb7d1cce35e /changelog.d | |
parent | Remove redundant, failing, test (diff) | |
parent | Merge pull request #3794 from matrix-org/erikj/faster_typing (diff) | |
download | synapse-f094f715cff95a7cebcbd984dbaccf3f1d81615e.tar.xz |
Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/3794.misc | 1 | ||||
-rw-r--r-- | changelog.d/3946.misc | 1 | ||||
-rw-r--r-- | changelog.d/3952.misc | 1 | ||||
-rw-r--r-- | changelog.d/3961.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/3965.misc | 1 | ||||
-rw-r--r-- | changelog.d/3970.bugfix | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/changelog.d/3794.misc b/changelog.d/3794.misc new file mode 100644 |