summary refs log tree commit diff
path: root/LICENSE
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-02-01 18:05:47 -0700
committerGitHub <noreply@github.com>2018-02-01 18:05:47 -0700
commit6e87b34f7b7c595d4e5b96e4a0281b8327e5b8b7 (patch)
tree35701fcc0456593d736a3405f72a5dfd624b1cad /LICENSE
parentpep8 (diff)
parentMerge pull request #2837 from matrix-org/rav/fix_quarantine_media (diff)
downloadsynapse-6e87b34f7b7c595d4e5b96e4a0281b8327e5b8b7.tar.xz
Merge branch 'develop' into travis/admin-list-media
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions