diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-23 15:36:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-23 15:36:59 +0100 |
| commit | 4225a97f4e63ce82a21ea1e07c0a54324df261ec (patch) | |
| tree | 006b8f4be1beba9aacbcd9ce379cb40ff6bd2f22 /synapse | |
| parent | Merge pull request #1136 from matrix-org/erikj/fix_signed_3pid (diff) | |
| parent | Merge branch 'release-v0.18.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-4225a97f4e63ce82a21ea1e07c0a54324df261ec.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |