forked-synapse/synapse/rest
David Baker 5c6189ea3e Merge branch 'develop' into pushers
Conflicts:
	synapse/rest/__init__.py
2015-01-22 17:46:16 +00:00
..
client Merge branch 'develop' into pushers 2015-01-22 17:46:16 +00:00
media Move rest APIs back under the rest directory 2015-01-22 16:10:07 +00:00
__init__.py Merge branch 'develop' into pushers 2015-01-22 17:46:16 +00:00