diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-24 23:42:25 +1000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-24 23:42:25 +1000 |
| commit | 04eed80a73add90b5591fa5943648402dcd5bcaf (patch) | |
| tree | a84f7bfee019b7ad0e79637bba015777ae663461 /synapse | |
| parent | Merge pull request #3927 from matrix-org/erikj/handle_background_errors (diff) | |
| parent | Merge tag 'v0.33.5' (diff) | |
| download | synapse-04eed80a73add90b5591fa5943648402dcd5bcaf.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 |