David Baker c291a4d522 Merge branch 'develop' into pushers ... Conflicts: synapse/handlers/events.py synapse/server.py		2015-01-28 12:51:05 +00:00
..
schema	Oops: second part of commit dc938606	2015-01-22 17:38:53 +00:00
__init__.py	Add brackets to make get room name / alias work	2015-01-26 16:52:47 +00:00
_base.py	Merge branch 'develop' into pushers	2015-01-13 13:15:51 +00:00
directory.py	Update copyright notices	2015-01-06 13:21:39 +00:00
event_federation.py	Update copyright notices	2015-01-06 13:21:39 +00:00
feedback.py	Update copyright notices	2015-01-06 13:21:39 +00:00
keys.py	Update copyright notices	2015-01-06 13:21:39 +00:00
media_repository.py	Update copyright notices	2015-01-06 13:21:39 +00:00
presence.py	Update copyright notices	2015-01-06 13:21:39 +00:00
profile.py	Update copyright notices	2015-01-06 13:21:39 +00:00
push_rule.py	Add API to delete push rules.	2015-01-23 17:49:37 +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	Update copyright notices	2015-01-06 13:21:39 +00:00
room.py	Remove unused functions	2015-01-13 15:57:26 +00:00
roommember.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
signatures.py	Update copyright notices	2015-01-06 13:21:39 +00:00
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	Add index on transaction_id to sent_transcations	2015-01-06 15:40:38 +00:00