diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 17:13:33 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 17:13:33 +0100 |
| commit | d5a825edee07cc0e66904283ea86a923b50beb69 (patch) | |
| tree | 8b06dbdbac6d79c6a23b3fb8037b579ccf223a8e /synapse/server.py | |
| parent | Merge branch 'develop' into refresh (diff) | |
| parent | Remove incorrect whitespace (diff) | |
| download | synapse-d5a825edee07cc0e66904283ea86a923b50beb69.tar.xz | |
Merge branch 'auth' into refresh
Conflicts: synapse/handlers/register.py
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions