diff options
author | Will Hunt <will@half-shot.uk> | 2018-07-27 12:26:52 +0100 |
---|---|---|
committer | Will Hunt <will@half-shot.uk> | 2018-07-27 12:26:52 +0100 |
commit | 46afacc215db24b128e502c2c23cc3f3205d6f70 (patch) | |
tree | eb8bd164bcc1b49b507e4d41c900325bcbfc5a5a /synapse/http/servlet.py | |
parent | Auth media/r0/config (diff) | |
parent | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid (diff) | |
download | synapse-46afacc215db24b128e502c2c23cc3f3205d6f70.tar.xz |
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Diffstat (limited to 'synapse/http/servlet.py')
-rw-r--r-- | synapse/http/servlet.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py |