diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-12-12 14:21:49 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-12-12 14:21:49 +0000 |
commit | deeebbfcb71d100cee18a8a26cc288a1cf352b83 (patch) | |
tree | 2948cf78c93d74ce1618a81c10ae497360e0af83 /synapse/http/server.py | |
parent | Merge pull request #435 from matrix-org/erikj/search (diff) | |
parent | Merge pull request #436 from matrix-org/markjh/pip_instructions (diff) | |
download | synapse-deeebbfcb71d100cee18a8a26cc288a1cf352b83.tar.xz |
Merge branch 'release-v0.12.0' into develop
Diffstat (limited to 'synapse/http/server.py')
0 files changed, 0 insertions, 0 deletions