summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-01-23 13:45:23 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-01-23 13:45:23 +0000
commit51fc3f693ec70b9e2d0f8ce38873469d2cb2ff41 (patch)
treeb83036edcde8e6d89e2ff175633b61b0bd77dcc9 /demo
parenta bit of debugging for media storage providers (#6757) (diff)
parentFixup changelog (diff)
downloadsynapse-51fc3f693ec70b9e2d0f8ce38873469d2cb2ff41.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions