summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-11 14:00:50 +0100
committerErik Johnston <erik@matrix.org>2019-06-11 14:00:50 +0100
commit03b09b32d6e368abe1ac0a5865d1be4fea7de787 (patch)
tree97311ef02ed7c2799fe77cf83b885be787313b4c /synapse/python_dependencies.py
parentMerge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-or... (diff)
parentMerge pull request #5424 from matrix-org/erikj/change_password_reset_links (diff)
downloadsynapse-03b09b32d6e368abe1ac0a5865d1be4fea7de787.tar.xz
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/python_dependencies.py')
-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 6efd81f204..7dfa78dadb 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -80,7 +80,7 @@ REQUIREMENTS = [ ] CONDITIONAL_REQUIREMENTS = { - "email": ["Jinja2>=2.9", "bleach>=1.4.2"], + "email": ["Jinja2>=2.9", "bleach>=1.4.3"], "matrix-synapse-ldap3": ["matrix-synapse-ldap3>=0.1"], # we use execute_batch, which arrived in psycopg 2.7.