diff options
| author | Jeroen <vo.jeroen@gmail.com> | 2018-07-14 20:24:46 +0200 |
|---|---|---|
| committer | Jeroen <vo.jeroen@gmail.com> | 2018-07-14 20:24:46 +0200 |
| commit | 505530f36abba53234c2fa29262a0de87face4fb (patch) | |
| tree | 313bbefb0f7b9693f1189a86410fe3dcdb9207f7 /tests/handlers/test_device.py | |
| parent | Merge branch 'develop' into send_sni_for_federation_requests (diff) | |
| parent | Fix develop because I broke it :( (#3535) (diff) | |
| download | synapse-505530f36abba53234c2fa29262a0de87face4fb.tar.xz | |
Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests
# Conflicts: # synapse/crypto/context_factory.py
Diffstat (limited to 'tests/handlers/test_device.py')
| -rw-r--r-- | tests/handlers/test_device.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/handlers/test_device.py b/tests/handlers/test_device.py index 778ff2f6e9..633a0b7f36 100644 --- a/tests/handlers/test_device.py +++ b/tests/handlers/test_device.py @@ -17,8 +17,8 @@ from twisted.internet import defer import synapse.api.errors import synapse.handlers.device - import synapse.storage + from tests import unittest, utils user1 = "@boris:aaa" |