diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-18 13:57:55 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-18 13:57:55 +0000 |
commit | a7925259a15f2995af2fedc2a8c59cdabd78b963 (patch) | |
tree | 079f8fefaf9ae250d13bb3d3ec888cc16356a577 /synapse/python_dependencies.py | |
parent | Add errback to all deferreds in transaction_queue (diff) | |
parent | Merge pull request #80 from matrix-org/restrict-destinations (diff) | |
download | synapse-a7925259a15f2995af2fedc2a8c59cdabd78b963.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r-- | synapse/python_dependencies.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py |