summary refs log tree commit diff
path: root/MANIFEST.in
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-06-21 14:11:26 +0100
committerGitHub <noreply@github.com>2017-06-21 14:11:26 +0100
commit71995e1397419cf4dade36b1cbe7f392345e40eb (patch)
tree73975e960b5a80f7a466cbf62810639662093d4a /MANIFEST.in
parentMerge pull request #2292 from matrix-org/erikj/quarantine_media (diff)
parentMerge branch 'develop' into avoid_duplicate_filters (diff)
downloadsynapse-71995e1397419cf4dade36b1cbe7f392345e40eb.tar.xz
Merge pull request #2219 from krombel/avoid_duplicate_filters
only add new filter when not existent prevoisly
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions