forked-synapse/synapse/rest/client/v1
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 Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
base.py Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
directory.py Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
events.py Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
initial_sync.py Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
login.py Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
presence.py Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
profile.py Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
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 Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
room.py Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
transactions.py Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
voip.py Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00