diff options
| author | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-26 21:35:42 +1000 |
|---|---|---|
| committer | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-26 21:35:42 +1000 |
| commit | 8d9a56e0a6fc9fcf2bb9fdcf2ffd02ed06a5004d (patch) | |
| tree | c1447febc3581a6f6e2c91ce3dd962dadae2f9e3 /synapse/__init__.py | |
| parent | fix merging forward (diff) | |
| parent | Merge tag 'v1.2.1' into shhs (diff) | |
| download | synapse-shhs.tar.xz | |
Merge branch 'shhs' of ssh://github.com/matrix-org/synapse into shhs shhs-v1.2.1.1 github/shhs shhs
Diffstat (limited to 'synapse/__init__.py')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |