summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <gohr@cosmocode.de>2012-05-23 09:14:14 +0200
committerAndreas Gohr <gohr@cosmocode.de>2012-05-23 09:14:14 +0200
commit10544f7eec93e72b8939a7d741b5fd4ef4b0a4e9 (patch)
tree6fa99a56fd36ecdbc50df3d8f96cdaf8dae828bc
parent78035fe8ffc269afc488a230cb7c7f73e2fb10a0 (diff)
downloadrpg-10544f7eec93e72b8939a7d741b5fd4ef4b0a4e9.tar.gz
rpg-10544f7eec93e72b8939a7d741b5fd4ef4b0a4e9.tar.bz2
added .ico to allowed mime types
the new template allows to use a favicon in media/wiki/favicon.ico so we should support uploading it as well.
-rw-r--r--conf/mime.conf1
-rw-r--r--lib/images/fileicons/ico.pngbin0 -> 907 bytes
2 files changed, 1 insertions, 0 deletions
diff --git a/conf/mime.conf b/conf/mime.conf
index 24529b06c..381b93f86 100644
--- a/conf/mime.conf
+++ b/conf/mime.conf
@@ -7,6 +7,7 @@ jpg image/jpeg
jpeg image/jpeg
gif image/gif
png image/png
+ico image/vnd.microsoft.icon
swf application/x-shockwave-flash
mp3 audio/mpeg
diff --git a/lib/images/fileicons/ico.png b/lib/images/fileicons/ico.png
new file mode 100644
index 000000000..1d9dd562a
--- /dev/null
+++ b/lib/images/fileicons/ico.png
Binary files differ