Daniel Wagner-Hall d5a825edee Merge branch 'auth' into refresh
Conflicts:
	synapse/handlers/register.py
2015-08-20 17:13:33 +01:00
..
2015-01-06 13:21:39 +00:00
2015-08-20 17:13:33 +01:00
2015-08-13 17:20:59 +01:00
2015-08-18 11:19:08 +01:00
2015-08-13 16:58:10 +01:00
2015-08-20 17:10:10 +01:00