1354 Commits (b5fef6054a3d5763a031440ad4c56fc97b12d2aa)

Author	SHA1	Message	Date
David Baker	6927b6b197	This really serves me right for ever making a map called 'map'.	2015-01-23 10:21:47 +00:00
David Baker	8a850573c9	As yet fairly untested GET API for push rules	2015-01-22 19:32:17 +00:00
David Baker	5c6189ea3e	Merge branch 'develop' into pushers ... Conflicts: synapse/rest/__init__.py	2015-01-22 17:46:16 +00:00
Mark Haines	97c68c508d	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00