diff options
| author | Erik Johnston <erik@matrix.org> | 2018-01-11 11:23:40 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-01-11 11:23:40 +0000 |
| commit | 07ab948c38bd6ace4b648d98ef383c006003047b (patch) | |
| tree | 59833960299618a89ef6c480a6cd7349a339ca25 /synapse | |
| parent | Merge pull request #2773 from matrix-org/erikj/hash_bg (diff) | |
| parent | Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-07ab948c38bd6ace4b648d98ef383c006003047b.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse 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 |