summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-08 14:40:54 +0000
committerErik Johnston <erik@matrix.org>2016-11-08 14:40:54 +0000
commit291628d42a8dbd6cbf49154d6a5b35582c0e5cde (patch)
tree0fddc5139ddd2509422cba07e544a4998f19c8e7 /demo
parentMerge branch 'release-v0.18.2' of github.com:matrix-org/synapse (diff)
parentBump version and changelog (diff)
downloadsynapse-291628d42a8dbd6cbf49154d6a5b35582c0e5cde.tar.xz
Merge branch 'erikj/ldap3_auth' v0.18.3
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions