diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-06-16 11:20:17 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-06-16 11:20:17 +0100 |
| commit | f1f70bf4b5172beb1eae671ad4016e342a6cdc92 (patch) | |
| tree | 7c6cfa9161a534505eb4e33588a1300647100ebd /synapse/__init__.py | |
| parent | Add worker config module (diff) | |
| parent | Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode (diff) | |
| download | synapse-f1f70bf4b5172beb1eae671ad4016e342a6cdc92.tar.xz | |
Merge remote-tracking branch 'origin/develop' into markjh/worker_config
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 |