diff options
| author | Neil Johnson <neil@matrix.org> | 2018-05-18 14:07:50 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-05-18 14:07:50 +0100 |
| commit | 2725223f0818396665b49463c4d65c68e969c8fa (patch) | |
| tree | b2793e28392774fe7386d1a2ff8781b336af258e /synapse | |
| parent | Merge pull request #3232 from matrix-org/rav/server_notices_room (diff) | |
| parent | Merge tag 'v0.29.1' (diff) | |
| download | synapse-2725223f0818396665b49463c4d65c68e969c8fa.tar.xz | |
Merge branch 'master' 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 |