diff options
author | Erik Johnston <erik@matrix.org> | 2018-05-23 10:54:14 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-05-23 10:54:14 +0100 |
commit | 6e11803ed3669fb897fe61da168eb033ad495198 (patch) | |
tree | 936c98227c65d687318c3d573a4c4a5a5fdb1e33 /synapse/http/site.py | |
parent | Merge pull request #3226 from matrix-org/erikj/chunk_base (diff) | |
parent | Merge pull request #3265 from matrix-org/erikj/limit_pagination (diff) | |
download | synapse-6e11803ed3669fb897fe61da168eb033ad495198.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_chunks
Diffstat (limited to 'synapse/http/site.py')
-rw-r--r-- | synapse/http/site.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py |