David Baker 6532b6e607 Merge branch 'develop' into csauth ... Conflicts: synapse/http/server.py		2015-04-24 09:37:54 +01:00
..
__init__.py	password -> account servlet and add start of an 'add 3pid' endpoint	2015-04-17 13:44:12 +01:00
_base.py	Throw sensible errors on not-json when allowing empty body	2015-04-02 17:45:16 +01:00
account.py	Dedicated error code for failed 3pid auth verification	2015-04-23 18:20:17 +01:00
auth.py	pep8	2015-04-02 17:06:17 +01:00
filter.py	Blunty replace json with simplejson	2015-02-11 14:23:10 +00:00
register.py	make add3pid servlet work	2015-04-17 16:44:49 +01:00
sync.py	Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator	2015-04-21 16:35:53 +01:00