diff options
author | Erik Johnston <erik@matrix.org> | 2019-06-17 14:10:28 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-06-17 14:10:28 +0100 |
commit | c08e4dbadc36d5547d4ff14ec4d985823666fb80 (patch) | |
tree | 3a79f31f2785db645e5f28088c63e8e06c01c0ca /setup.py | |
parent | Merge branch 'master' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions (diff) | |
download | synapse-c08e4dbadc36d5547d4ff14ec4d985823666fb80.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/setup.py b/setup.py |