diff options
| author | Greg Aker <greg@gregaker.net> | 2011-12-25 08:44:33 +0100 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-12-25 08:44:33 +0100 |
| commit | ef38f0a6d83025fbd99ace5ec60311acfe9121c4 (patch) | |
| tree | 1728bc5df9412d8eccc2919bf3cd3f6bbe6a52d0 /system/core/Output.php | |
| parent | d90e1a0fb541ee94459a20cf8b0726aebaec9692 (diff) | |
| parent | a96ade374f28cdae97036fc253fd8b2a0e8dc81a (diff) | |
Merge branch 'develop' into feature/unit-tests
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 { |