summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-17 14:37:13 +0000
committerErik Johnston <erik@matrix.org>2015-11-17 14:37:13 +0000
commit0186aef81421111ead4577debafcada211ddd0c3 (patch)
tree2c8bfa0a7d9276b54ed2503926240015dfa47ea1 /synapse/__init__.py
parentBump version and change log (diff)
parentMerge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver (diff)
downloadsynapse-0186aef81421111ead4577debafcada211ddd0c3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions