Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into csauth | David Baker | 2015-04-24 | 1 | -1/+6 |
|\ | | | | | | | | | Conflicts: synapse/http/server.py | ||||
| * | The new parameter to urlopen is "context" not "ctx" | Mark Haines | 2015-04-17 | 1 | -1/+1 |
| | | |||||
| * | As of version 2.7.9, urllib2 now checks SSL certs | Erik Johnston | 2015-04-17 | 1 | -1/+6 |
| | | |||||
* | | Add shared secret auth into register v2 and switch the script over. | David Baker | 2015-04-02 | 1 | -3/+2 |
|/ | |||||
* | Rename register script to 'register_new_matrix_user' | Erik Johnston | 2015-03-13 | 1 | -0/+149 |