David Baker d72ce4da64 Merge branch 'develop' of github.com:matrix-org/synapse into develop ... Conflicts: synapse/http/client.py		2014-09-03 18:25:17 +01:00
..
login-controller.js	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-09-03 18:25:17 +01:00
login.html	make the little logos clickable for Erik	2014-09-01 13:22:42 +01:00
register-controller.js	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-09-03 18:25:17 +01:00
register.html	Make registering and logging in with a threepid work in the webclient.	2014-09-03 18:23:56 +01:00