summary refs log tree commit diff
path: root/synapse/config/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-22 11:49:12 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-22 11:49:12 +0000
commit542ab0f88661e1d737dfc604332ae841932dfbbb (patch)
tree856098a377bb701928d21d2b50d4ac808bd7c306 /synapse/config/__init__.py
parentAllow guest access to /sync (diff)
parentMerge pull request #453 from matrix-org/daniel/avatarurls (diff)
downloadsynapse-542ab0f88661e1d737dfc604332ae841932dfbbb.tar.xz
Merge branch 'develop' into markjh/guest_access
Diffstat (limited to 'synapse/config/__init__.py')
0 files changed, 0 insertions, 0 deletions