diff options
author | Erik Johnston <erik@matrix.org> | 2017-10-25 10:27:23 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-10-25 10:27:23 +0100 |
commit | 1ad1ba9e6aa0fc7568e428d4cbc59d6e9e9c4943 (patch) | |
tree | ae7abf750d6ee109f8af7f6774237669b6659982 | |
parent | tip for generating tls_fingerprints (diff) | |
parent | Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse (diff) | |
download | synapse-1ad1ba9e6aa0fc7568e428d4cbc59d6e9e9c4943.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
-rw-r--r-- | CHANGES.rst | 8 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst |