summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-20 14:13:54 +0100
committerErik Johnston <erik@matrix.org>2016-06-20 14:13:54 +0100
commit00c281f6a481671c8c37b17aa4ec7216bc551b27 (patch)
tree95d3dceb57e2edf136192ad32f7a7ccadbdbbeb1 /synapse/__init__.py
parentUpdate change log (diff)
parentMerge pull request #880 from matrix-org/markjh/registered_user (diff)
downloadsynapse-00c281f6a481671c8c37b17aa4ec7216bc551b27.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions