summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-02-22 12:55:32 +0000
committerErik Johnston <erik@matrix.org>2021-02-22 12:55:32 +0000
commit5d405f7e7a292691e30a33a762b7834d9854209b (patch)
tree40863c9e510ac4ad8aa2eada7bbdab6c9760cb27 /synapse/__init__.py
parentMerge remote-tracking branch 'origin/release-v1.28.0' into matrix-org-hotfixes (diff)
parentClean up the user directory sample config section (#9385) (diff)
downloadsynapse-5d405f7e7a292691e30a33a762b7834d9854209b.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions