diff options
author | Matthew Hodgson <matthew@matrix.org> | 2018-04-12 13:29:57 +0100 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2018-04-12 13:29:57 +0100 |
commit | 0d2b7fdcec04d994a55f1fbbe53f848742c89e0a (patch) | |
tree | 58682de74f81bf3d1d85d31c40266583b775842a /synapse/python_dependencies.py | |
parent | Merge pull request #2973 from matrix-org/matthew/dinsic_3pid_check (diff) | |
parent | Merge pull request #3092 from matrix-org/rav/response_cache_metrics (diff) | |
download | synapse-0d2b7fdcec04d994a55f1fbbe53f848742c89e0a.tar.xz |
Merge branch 'develop' into dinsic
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r-- | synapse/python_dependencies.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py |