diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-11 10:19:36 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-11 10:20:43 +0000 |
commit | 8c83cc471bb65494dd62aeb6055f64088ac99bdd (patch) | |
tree | 853fc05aaa43539404f957e69f41c3499f604cc6 /synapse/http/server.py | |
parent | Merge pull request #60 from matrix-org/single_source_version_and_dependencies (diff) | |
parent | Merge pull request #59 from matrix-org/hotfixes-v0.6.1f (diff) | |
download | synapse-8c83cc471bb65494dd62aeb6055f64088ac99bdd.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/http/server.py')
0 files changed, 0 insertions, 0 deletions