diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-17 14:37:13 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-17 14:37:13 +0000 |
commit | 0186aef81421111ead4577debafcada211ddd0c3 (patch) | |
tree | 2c8bfa0a7d9276b54ed2503926240015dfa47ea1 /synapse/state.py | |
parent | Bump version and change log (diff) | |
parent | Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver (diff) | |
download | synapse-0186aef81421111ead4577debafcada211ddd0c3.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
Diffstat (limited to 'synapse/state.py')
0 files changed, 0 insertions, 0 deletions