diff options
author | Erik Johnston <erik@matrix.org> | 2017-05-17 13:28:46 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-05-17 13:28:46 +0100 |
commit | 9f430fa07f4bb88ae276efa366195e9282caa60d (patch) | |
tree | 2a79c0d5452e31174ad46541f8a906ff4939f669 /synapse | |
parent | Merge pull request #2229 from matrix-org/erikj/faster_get_joined (diff) | |
parent | Update changelog (diff) | |
download | synapse-9f430fa07f4bb88ae276efa366195e9282caa60d.tar.xz |
Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |