Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-11-12 16:06:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact

Browse source
This commit is contained in:
Erik Johnston 2018-08-24 17:00:37 +01:00
commit 9db2476991
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/server_notices/test_resource_limits_server_notices.py
View file

@ -55,6 +55,7 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
returnValue=""
)
self._rlsn._store.add_tag_to_room = Mock()
self._rlsn._store.get_tags_for_room = Mock(return_value={})
self.hs.config.admin_contact = "mailto:user@test.com"
@defer.inlineCallbacks