diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-26 10:22:41 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-26 10:22:41 +0100 |
commit | 45fffe8cbed41dfe5c263015eb8f3cca19d8f1b8 (patch) | |
tree | 9598bfe75f8553ce5da7f30b41be260572760406 /synapse/server.py | |
parent | Bump version (diff) | |
parent | Merge pull request #165 from matrix-org/bugs/SYN-390 (diff) | |
download | synapse-45fffe8cbed41dfe5c263015eb8f3cca19d8f1b8.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions