Daniel Wagner-Hall 7e90fb6a57 Merge branch 'develop' into daniel/roomcleanupincremental ... Conflicts: synapse/rest/client/v1/room.py		2016-02-17 15:53:59 +00:00
..
engines
schema
util
__init__.py
_base.py
account_data.py
appservice.py
background_updates.py
directory.py
end_to_end_keys.py
event_federation.py	Respond to federated invite with non-empty context	2016-02-17 15:25:12 +00:00
event_push_actions.py	Rename functions	2016-02-10 11:09:56 +00:00
events.py	Rename functions	2016-02-10 11:09:56 +00:00
filtering.py
keys.py
media_repository.py
prepare_database.py	Change a log from debug to info	2016-02-09 14:44:12 +00:00
presence.py
profile.py
push_rule.py	Make adding push rules idempotent	2016-02-16 15:53:38 +00:00
pusher.py
receipts.py	Invalidate get_last_receipt_event_id_for_user cache	2016-02-09 14:27:29 +00:00
registration.py
rejections.py
room.py
roommember.py
search.py
signatures.py
state.py	Batch fetch _get_state_groups_from_groups	2016-02-10 13:24:42 +00:00
stream.py	Fix SYN-627, events are in incorrect room in /sync	2016-02-11 15:02:56 +00:00
tags.py
transactions.py