summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-09 11:38:13 +0000
committerErik Johnston <erik@matrix.org>2019-01-09 11:38:13 +0000
commit484867d35dfc99314053c58020a562d29b68da68 (patch)
treeb3075131453083b31b54a0eae8022a81065ca6df /demo
parentclean up changelog (diff)
parentMerge pull request #4362 from matrix-org/erikj/better_errors (diff)
downloadsynapse-484867d35dfc99314053c58020a562d29b68da68.tar.xz
Merge branch 'develop' into release-v0.34.1
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions