Mark Haines ec7460b4f2 Merge branch 'develop' into markjh/pushrule_stream		2016-03-04 14:44:34 +00:00
..
__init__.py	…
admin.py	…
base.py	…
directory.py	Merge pull request #614 from matrix-org/erikj/alias_delete	2016-03-04 09:02:33 +00:00
events.py	…
initial_sync.py	…
login.py	…
presence.py	…
profile.py	Pass whole requester to ratelimiting	2016-03-03 16:43:42 +00:00
push_rule.py	Hook up the push rules stream to account_data in /sync	2016-03-04 14:44:01 +00:00
pusher.py	…
register.py	…
room.py	Pass whole requester to ratelimiting	2016-03-03 16:43:42 +00:00
transactions.py	…
voip.py	…