summary refs log tree commit diff
path: root/synapse/rest/media
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 11:03:47 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 11:03:47 +0100
commitade5342752498867140630f014c692787cbbedc9 (patch)
tree1741b76d4e4f06c81ff290c688d196a51d020fd5 /synapse/rest/media
parentMerge pull request #232 from matrix-org/erikj/appservice_joined_rooms (diff)
parentMerge branch 'develop' into auth (diff)
downloadsynapse-ade5342752498867140630f014c692787cbbedc9.tar.xz
Merge branch 'auth' into refresh
Diffstat (limited to 'synapse/rest/media')
0 files changed, 0 insertions, 0 deletions