Commit Graph

5 Commits (c28f1d16f072b22ae34be34d3cbcc8a06e394f6f)

Author SHA1 Message Date
David Baker 6532b6e607 Merge branch 'develop' into csauth
Conflicts:
	synapse/http/server.py
2015-04-24 09:37:54 +01:00
Mark Haines fd4fa9097f The new parameter to urlopen is "context" not "ctx" 2015-04-17 14:44:31 +01:00
Erik Johnston 16dcdedc8a As of version 2.7.9, urllib2 now checks SSL certs 2015-04-17 13:24:55 +01:00
David Baker 70a84f17f3 Add shared secret auth into register v2 and switch the script over. 2015-04-02 17:01:29 +01:00
Erik Johnston 7393c5ce4c Rename register script to 'register_new_matrix_user' 2015-03-13 15:33:21 +00:00