diff options
author | Erik Johnston <erik@matrix.org> | 2016-05-18 11:38:24 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-05-18 11:38:24 +0100 |
commit | 5941346c5b8b0847a0adc643e80ba6ba8669c149 (patch) | |
tree | 0f7bd386246268177ca45ee4b6ddd992b333e085 /tests/utils.py | |
parent | Correctly order recents (diff) | |
parent | Add desc to get_presence_for_users (diff) | |
download | synapse-5941346c5b8b0847a0adc643e80ba6ba8669c149.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginate_sync
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py |