diff options
author | Erik Johnston <erik@matrix.org> | 2018-04-12 13:35:56 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-04-12 13:35:56 +0100 |
commit | dd7f1b10cece222db5b57d92727afaf7780f8b79 (patch) | |
tree | e9499a2b7cd19f5efab7d7268461e89a5ad2d19a /synapse/python_dependencies.py | |
parent | Merge branch 'develop' of https://github.com/matrix-org/synapse into matrix-o... (diff) | |
parent | Merge pull request #3092 from matrix-org/rav/response_cache_metrics (diff) | |
download | synapse-dd7f1b10cece222db5b57d92727afaf7780f8b79.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to '')
-rw-r--r-- | synapse/python_dependencies.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py |