summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-11 18:35:16 +0000
committerErik Johnston <erik@matrix.org>2015-11-11 18:35:16 +0000
commit884e601683adf11d8ff8b0fb6bb34188524bf5c5 (patch)
tree150e39eaed6280868736efb50f036f72e8033570 /synapse/config/_base.py
parentMerge pull request #361 from matrix-org/daniel/guestcontext (diff)
parentUpdate date (diff)
downloadsynapse-884e601683adf11d8ff8b0fb6bb34188524bf5c5.tar.xz
Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/_base.py')
0 files changed, 0 insertions, 0 deletions