diff options
author | Erik Johnston <erik@matrix.org> | 2017-02-21 13:46:27 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-02-21 13:46:27 +0000 |
commit | a3708a18851376ddeedd639cefa7e92648fd8177 (patch) | |
tree | f1fbca2d4a7bc5704c1fbb136da0aec0162e3d65 | |
parent | Merge pull request #1930 from matrix-org/rav/fix_txnq_race (diff) | |
parent | Merge branch 'release-v0.19.2' of github.com:matrix-org/synapse (diff) | |
download | synapse-a3708a18851376ddeedd639cefa7e92648fd8177.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
-rw-r--r-- | CHANGES.rst | 7 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst |