Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh ... Conflicts: synapse/rest/client/v1/login.py		2015-08-20 16:25:40 +01:00
..
__init__.py	/tokenrefresh POST endpoint	2015-08-20 16:21:35 +01:00
_base.py	Throw sensible errors on not-json when allowing empty body	2015-04-02 17:45:16 +01:00
account.py	Remove spurious extra arg to set_password	2015-08-20 15:35:54 +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
keys.py	Get the end-to-end key federation working	2015-07-24 18:26:46 +01:00
receipts.py	Wire together receipts and the notifer/federation	2015-07-07 15:25:30 +01:00
register.py	Merge pull request #211 from matrix-org/email_in_use	2015-08-20 10:04:04 +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
tokenrefresh.py	/tokenrefresh POST endpoint	2015-08-20 16:21:35 +01:00