David Baker 6532b6e607 Merge branch 'develop' into csauth ... Conflicts: synapse/http/server.py		2015-04-24 09:37:54 +01:00
..
v1	Allow multiple pushers for a single app ID & pushkey, honouring the 'append' flag in the API.	2015-03-25 19:06:22 +00:00
v2_alpha	Merge branch 'develop' into csauth	2015-04-24 09:37:54 +01:00
__init__.py	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00