diff options
author | Erik Johnston <erik@matrix.org> | 2018-03-26 21:41:55 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-03-26 21:41:55 +0100 |
commit | 9b8c0fb16269b0840ba2384cdb59ea3ff1190d0b (patch) | |
tree | 3b2188440c3ad8568ec9a888fab2aebb11959da1 | |
parent | fix typo (diff) | |
parent | Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse (diff) | |
download | synapse-9b8c0fb16269b0840ba2384cdb59ea3ff1190d0b.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
-rw-r--r-- | CHANGES.rst | 20 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst |