diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2019-05-15 23:30:22 -0500 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-05-15 23:30:22 -0500 |
commit | d424ba9e5bbcb63ae3929401a27cb89ac269938f (patch) | |
tree | 45a6f462ab3b34091193665f5a2e0c5bf195dcbe /synapse/api/urls.py | |
parent | Merge remote-tracking branch 'origin/develop' into shhs (diff) | |
parent | Make all the rate limiting options more consistent (#5181) (diff) | |
download | synapse-d424ba9e5bbcb63ae3929401a27cb89ac269938f.tar.xz |
Merge remote-tracking branch 'origin/develop' into shhs
Diffstat (limited to 'synapse/api/urls.py')
-rw-r--r-- | synapse/api/urls.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py |