David Baker b56730bb6e Merge branch 'develop' into pushers ... Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py		2014-12-18 15:15:22 +00:00
..
__init__.py	Merge branch 'develop' into pushers	2014-12-18 15:15:22 +00:00
admin.py	Change DomainSpecificString so that it doesn't use a HomeServer object	2014-12-02 10:42:28 +00:00
base.py	Kill off synapse.api.events.*	2014-12-16 11:29:05 +00:00
directory.py	Remove unused imports	2014-12-12 16:31:59 +00:00
events.py	Fix pep8 codestyle warnings	2014-11-20 17:26:36 +00:00
initial_sync.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
login.py	Change DomainSpecificString so that it doesn't use a HomeServer object	2014-12-02 10:42:28 +00:00
presence.py	Remove unused imports	2014-12-12 16:31:59 +00:00
profile.py	Remove unused imports	2014-12-12 16:31:59 +00:00
pusher.py	after a few rethinks, a working implementation of pushers.	2014-12-18 14:49:22 +00:00
register.py	Fix registration	2014-12-08 09:24:37 +00:00
room.py	clean up coding style a bit	2014-12-16 15:24:03 +00:00
transactions.py	clean up coding style a bit	2014-12-16 15:24:03 +00:00
voip.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00