diff options
author | Erik Johnston <erik@matrix.org> | 2018-03-22 10:19:53 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-03-22 10:19:53 +0000 |
commit | eb9fc021e302aa7a5c39902e056cc525328431f8 (patch) | |
tree | 9162c92d399494be5213ec24c6e547c42f40469a /demo/webserver.py | |
parent | Merge pull request #3015 from matrix-org/erikj/simplejson_replication (diff) | |
parent | Update CHANGES.rst (diff) | |
download | synapse-eb9fc021e302aa7a5c39902e056cc525328431f8.tar.xz |
Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'demo/webserver.py')
0 files changed, 0 insertions, 0 deletions