diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-11 17:25:54 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-11 17:25:54 +0100 |
| commit | 6dbd4987728b9fcf853b71fd50cd4d5f943fce85 (patch) | |
| tree | 0a64975c495d88e451dd5902e82c7f72076afb11 /synapse | |
| parent | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-or... (diff) | |
| parent | 1.0.0 (diff) | |
| download | synapse-6dbd4987728b9fcf853b71fd50cd4d5f943fce85.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into matrix-org-hotfixes
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 |