summary refs log tree commit diff
path: root/synapse/app/user_dir.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-14 10:26:27 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-14 10:26:27 +0000
commit473acedcdde26372003359a97699fba833824692 (patch)
treedf6441348856b5a731b91ca09602a9e127bb8801 /synapse/app/user_dir.py
parentsample config (diff)
parentMerge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 (diff)
downloadsynapse-473acedcdde26372003359a97699fba833824692.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_copy
* 'develop' of github.com:matrix-org/synapse:
  Blacklist PurgeRoomTestCase (#6361)
  Set room version default to 5
Diffstat (limited to 'synapse/app/user_dir.py')
0 files changed, 0 insertions, 0 deletions