David Baker 5c6189ea3e Merge branch 'develop' into pushers ... Conflicts: synapse/rest/__init__.py		2015-01-22 17:46:16 +00:00
..
schema	Oops: second part of commit dc938606	2015-01-22 17:38:53 +00:00
__init__.py	Oops: second part of commit dc938606	2015-01-22 17:38:53 +00:00
_base.py	…
directory.py	…
event_federation.py	…
feedback.py	…
keys.py	…
media_repository.py	…
presence.py	…
profile.py	…
push_rule.py	Add rest API & store for creating push rules	2015-01-22 17:37:12 +00:00
pusher.py	add instance_handles to pushers so we have a way to refer to them even if the push token changes.	2015-01-20 11:49:48 +00:00
registration.py	…
room.py	Remove unused functions	2015-01-13 15:57:26 +00:00
roommember.py	…
signatures.py	…
state.py	Remove unused functions	2015-01-13 15:57:26 +00:00
stream.py	get_room_events isn't called anywhere	2015-01-13 14:43:26 +00:00
transactions.py	…