diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-11 13:43:55 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-11 13:43:55 +0100 |
commit | 0d29112624c8034d7ace73674c151c74cb8addbb (patch) | |
tree | 2f05c8bd10e67ac16a5d0bd88ab56394ad7a81f2 /synapse | |
parent | Merge tag 'v1.15.0rc1' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | 1.15.0 (diff) | |
download | synapse-0d29112624c8034d7ace73674c151c74cb8addbb.tar.xz |
Merge branch 'release-v1.15.0' into matrix-org-hotfixes
Diffstat (limited to '')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |