diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2021-07-06 14:11:37 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2021-07-06 14:11:37 +0100 |
commit | fc8a586ab94a0ee704efbe865e3b2b4a6ea62d9a (patch) | |
tree | c6c5ce36652c0d08b346f5a7a9896ff36330902e /tests/handlers/test_presence.py | |
parent | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff) | |
parent | Small changelog tweaks (diff) | |
download | synapse-fc8a586ab94a0ee704efbe865e3b2b4a6ea62d9a.tar.xz |
Merge branch 'release-v1.38' into matrix-org-hotfixes
Diffstat (limited to 'tests/handlers/test_presence.py')
-rw-r--r-- | tests/handlers/test_presence.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py |