diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-12-03 00:10:07 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-12-03 00:10:07 +0100 |
| commit | 4766c1f0aaafeb23d5026904b802078cf82ebbe1 (patch) | |
| tree | 01c45a10dddd42c02804ff71c7d236c8fa775e7e /conf | |
| parent | cded11250d495f6039a20f1036c64ea7b230ceb2 (diff) | |
| parent | b30dd803e3c33cfc9508b0516744b0bb95be4d09 (diff) | |
| download | rpg-4766c1f0aaafeb23d5026904b802078cf82ebbe1.tar.gz rpg-4766c1f0aaafeb23d5026904b802078cf82ebbe1.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mime.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/conf/mime.conf b/conf/mime.conf index 2a50fab10..c2e03b775 100644 --- a/conf/mime.conf +++ b/conf/mime.conf @@ -9,7 +9,6 @@ gif image/gif png image/png ico image/vnd.microsoft.icon -swf application/x-shockwave-flash mp3 audio/mpeg ogg audio/ogg wav audio/wav @@ -66,3 +65,7 @@ odt !application/vnd.oasis.opendocument.text #xml text/xml #csv text/csv +# Also flash may be able to execute arbitrary scripts in the website's +# context +#swf application/x-shockwave-flash + |