diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-08 16:43:17 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-08 16:43:17 +0100 |
| commit | 9cef051ce2b97aa6a0513744fe4f7adb93d76fe9 (patch) | |
| tree | c7c2b3ac6447384b91d8f433bd0f3045aab680e6 /synapse/__init__.py | |
| parent | Merge pull request #118 from matrix-org/dont-wait-for-notify (diff) | |
| parent | Merge pull request #119 from matrix-org/hotfixes-v0.8.1-r3 (diff) | |
| download | synapse-9cef051ce2b97aa6a0513744fe4f7adb93d76fe9.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
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 |