Erik Johnston c515d37797 Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections ... Conflicts: synapse/storage/schema/delta/v12.sql		2015-01-30 14:19:49 +00:00
..
schema	Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections	2015-01-30 14:19:49 +00:00
__init__.py	Merge branch 'rejections_storage' of github.com:matrix-org/synapse into replication_split	2015-01-30 14:17:47 +00:00
_base.py	Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage	2015-01-30 14:08:28 +00:00
directory.py	…
event_federation.py	…
feedback.py	…
keys.py	…
media_repository.py	…
presence.py	…
profile.py	…
push_rule.py	Code style fixes.	2015-01-29 16:12:40 +00:00
pusher.py	Code style fixes.	2015-01-29 16:12:40 +00:00
registration.py	Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events	2015-01-28 16:58:23 +00:00
rejections.py	Initial implementation of auth conflict resolution	2015-01-29 16:52:33 +00:00
room.py	…
roommember.py	…
signatures.py	…
state.py	…
stream.py	SYN-252: Supply the stream and topological parts in the correct order to the constructor	2015-01-29 01:48:48 +00:00
transactions.py	…