diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-12 15:24:06 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-12 15:24:06 +0000 |
commit | 92d850fc874aa5c77659adb6b5d38a99f989f0b5 (patch) | |
tree | 64f05ff96a9a1bb60374ea803d921f5256903e51 /synapse/__init__.py | |
parent | Merge branch 'release-v0.7.0' of github.com:matrix-org/synapse (diff) | |
parent | Merge pull request #69 from matrix-org/hotfixes-v0.7.0a (diff) | |
download | synapse-92d850fc874aa5c77659adb6b5d38a99f989f0b5.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 |