summary refs log tree commit diff
path: root/res/templates/room.txt
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-10-09 18:04:21 +0100
committerDavid Baker <dave@matrix.org>2018-10-09 18:04:21 +0100
commitb8d9e108be60b3d14a57238562bfb5f49781c2a6 (patch)
tree7c7ed96ac22ab1c369c7d0f39043f2ca409c436c /res/templates/room.txt
parentAdd changelog (diff)
downloadsynapse-b8d9e108be60b3d14a57238562bfb5f49781c2a6.tar.xz
Fix mergefail
Diffstat (limited to 'res/templates/room.txt')
0 files changed, 0 insertions, 0 deletions