diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-09 11:40:37 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-09 11:40:37 +0100 |
commit | a5ef1107490a8f581e8baf8a29d509826b8d2490 (patch) | |
tree | 24dcb2ae7813a421d04b6faa3a00c8ec646a7bef /tests/rest/client/test_transactions.py | |
parent | sync auth blocking (diff) | |
parent | Merge branch 'master' into develop (diff) | |
download | synapse-a5ef1107490a8f581e8baf8a29d509826b8d2490.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block
Diffstat (limited to 'tests/rest/client/test_transactions.py')
-rw-r--r-- | tests/rest/client/test_transactions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rest/client/test_transactions.py b/tests/rest/client/test_transactions.py |