4 Commits (2ebf795c0ada8b30f22f9aca54753471a04649f6)

Author	SHA1	Message	Date
David Baker	e0d2c6889b	Allow kind to be set to null to delete a pusher.	2015-01-29 17:05:00 +00:00
David Baker	8552ed8df2	Change uses of get_user_by_req because it returns a tuple now.	2015-01-28 18:04:40 +00:00
David Baker	20c47383dc	Oops, bad merge: needed to change the base class of the rest servlets too.	2015-01-28 14:10:46 +00:00
David Baker	5c6189ea3e	Merge branch 'develop' into pushers ... Conflicts: synapse/rest/__init__.py	2015-01-22 17:46:16 +00:00