diff options
author | Andrey Andreev <narf@bofh.bg> | 2011-12-25 14:53:24 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2011-12-25 14:53:24 +0100 |
commit | d34686f1a5ef557e8022c81961ad179a88c347ae (patch) | |
tree | 62c74b609e2093399abd5bc9af3934fb129cf33c /system/core/Output.php | |
parent | a92b903c0e6c2faa2a9480e23e2d3e4b6308878f (diff) | |
parent | a96ade374f28cdae97036fc253fd8b2a0e8dc81a (diff) |
Merge upstream branch
Diffstat (limited to 'system/core/Output.php')
-rwxr-xr-x | system/core/Output.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 7b53f8e3e..9727a184f 100755 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -108,7 +108,7 @@ class CI_Output { // Get mime types for later if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php')) { - include APPPATH.'config/'.ENVIRONMENT.'/mimes.php'; + include APPPATH.'config/'.ENVIRONMENT.'/mimes.php'; } else { |