Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh ... Conflicts: synapse/rest/client/v1/login.py		2015-08-20 16:25:40 +01:00
..
11
12
13
14	Add script to (re)convert the pushers table to changing the unique key. Also give the python db upgrade scripts the database engine so they can convert parameter strings, and add *args **kwargs to the upgrade function so we can add more args in future and previous scripts will ignore them.	2015-06-04 16:16:01 +01:00
15
16
17
18
19	Newline, remove debug logging	2015-05-18 10:11:14 +01:00
20	Add a dummy.sql into delta/20 as pip isn't packinging the pushers.py	2015-06-13 12:21:58 +01:00
21	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	2015-07-13 13:50:57 +01:00
22	Merge pull request #211 from matrix-org/email_in_use	2015-08-20 10:04:04 +01:00
23	/tokenrefresh POST endpoint	2015-08-20 16:21:35 +01:00