diff options
| author | nisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in> | 2013-03-21 09:59:46 +0100 |
|---|---|---|
| committer | nisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in> | 2013-03-21 09:59:46 +0100 |
| commit | 76f42d9dcd42bf90c407f151d04ef207c8deebdf (patch) | |
| tree | c98568cd18540f2df23881ceed82cf9f1616d4c4 /system/core/Output.php | |
| parent | 7d10006a0001ff0e7d82ec994b1e9cbb63683ffc (diff) | |
| parent | 13f6eabafa655828a8c09b4ae0a58a2e3776c269 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Output.php')
| -rw-r--r-- | system/core/Output.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 25ecd496c..3320ae154 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -793,6 +793,8 @@ class CI_Output { case 'text/css': case 'text/javascript': + case 'application/javascript': + case 'application/x-javascript': $output = $this->_minify_script_style($output); |