diff options
author | Erik Johnston <erik@matrix.org> | 2019-06-10 16:05:10 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-06-10 16:05:10 +0100 |
commit | aad993f24d3a33bd2b3172f6d47c2d28d3e7a921 (patch) | |
tree | 7f74b4f6795b91d81ceed8ea0f5a3b1e0f2a5876 /synapse/python_dependencies.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge branch 'erikj/fix_null_valid_until_ms' of github.com:matrix-org/synapse... (diff) | |
download | synapse-aad993f24d3a33bd2b3172f6d47c2d28d3e7a921.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.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py |