David Baker 5c6189ea3e Merge branch 'develop' into pushers ... Conflicts: synapse/rest/__init__.py		2015-01-22 17:46:16 +00:00
..
__init__.py	Merge branch 'develop' into pushers	2015-01-22 17:46:16 +00:00
admin.py	…
base.py	…
directory.py	…
events.py	…
initial_sync.py	…
login.py	…
presence.py	…
profile.py	…
push_rule.py	Merge branch 'develop' into pushers	2015-01-22 17:46:16 +00:00
pusher.py	Merge branch 'develop' into pushers	2015-01-22 17:46:16 +00:00
register.py	…
room.py	…
transactions.py	…
voip.py	…