diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-03-01 12:32:18 +0100 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-03-01 12:32:18 +0100 |
| commit | 7842b1bc8cc007521dcc55de613d6e3224cfe2c1 (patch) | |
| tree | 0631ea110b3e8b9de0159ffaab345926a3cd4884 /system/libraries/Upload.php | |
| parent | 9a96082726feadadd50aef1287b4e0df61414c0d (diff) | |
| parent | 76f15c9bb3004e6da99dd273c34ef3b92a23c17f (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird
Diffstat (limited to 'system/libraries/Upload.php')
| -rw-r--r-- | system/libraries/Upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 82383f658..0b853233d 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -960,7 +960,7 @@ class CI_Upload { } elseif (is_file(APPPATH.'config/mimes.php')) { - include(APPPATH.'config//mimes.php'); + include(APPPATH.'config/mimes.php'); } else { |