Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-29 23:18:39 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	setup.py
This commit is contained in:
Erik Johnston 2014-12-11 17:48:48 +00:00
commit cde840a82c
27 changed files with 1422 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
synapse/server.py
View file

@ -79,6 +79,7 @@ class BaseHomeServer(object):
'resource_for_web_client',
'resource_for_content_repo',
'resource_for_server_key',
'resource_for_media_repository',
'event_sources',
'ratelimiter',
'keyring',