summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-09-09 16:36:00 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-09-09 16:36:00 +0100
commit76f70779f18a130d6ec4194dba8ae42eeaa5afaa (patch)
tree4ed291496c99d3d9793b14b375b6bd12bfe468b5 /synapse/python_dependencies.py
parentRead all files as UTF-8 (diff)
downloadsynapse-76f70779f18a130d6ec4194dba8ae42eeaa5afaa.tar.xz
Revert "Merge pull request #5932 from matrix-org/babolivier/account_validity_template_encode"
This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing
changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb.
Diffstat (limited to '')
-rw-r--r--synapse/python_dependencies.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index 9692f0bf75..7dfa78dadb 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -67,7 +67,7 @@ REQUIREMENTS = [ "pymacaroons>=0.13.0", "msgpack>=0.5.0", "phonenumbers>=8.2.0", - "six>=1.12", + "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) "prometheus_client>=0.0.18,<0.4.0",