summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-03-08 22:16:53 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-03-08 22:16:53 +0100
commit9869f890f21c30d0016cd28d8ea1bdb89da3e96a (patch)
tree0f2276db81ce38f5b0d11755ce3e5db8d3ba538a /application
parente8b8d6824ca0a9bb3cadf88590be20744d71b867 (diff)
Added 'json' to config/mimes.php.
Diffstat (limited to 'application')
-rw-r--r--application/config/mimes.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 58eea5f83..8065794ff 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -97,7 +97,8 @@ $mimes = array( 'hqx' => 'application/mac-binhex40',
'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'word' => array('application/msword', 'application/octet-stream'),
'xl' => 'application/excel',
- 'eml' => 'message/rfc822'
+ 'eml' => 'message/rfc822',
+ 'json' => array('application/json', 'text/json')
);