David Baker c291a4d522 Merge branch 'develop' into pushers ... Conflicts: synapse/handlers/events.py synapse/server.py		2015-01-28 12:51:05 +00:00
..
__init__.py	Update copyright notices	2015-01-06 13:21:39 +00:00
auth.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
constants.py	Update copyright notices	2015-01-06 13:21:39 +00:00
errors.py	Add slightly pedantic trailing slash error.	2015-01-23 11:19:02 +00:00
ratelimiting.py	Update copyright notices	2015-01-06 13:21:39 +00:00
urls.py	Add client v2_alpha resource to synapse server resource tree	2015-01-23 18:55:19 +00:00