Mark Haines 73e4ad4b8b Merge branch 'master' into develop ...

Conflicts:
	setup.py

2015-09-07 15:06:46 +01:00

..

register_new_matrix_user

Revert register_new_matrix_user to use v1 api

2015-05-22 11:59:48 +01:00

synapse_port_db

Merge branch 'master' into develop

2015-09-07 15:06:46 +01:00