summaryrefslogtreecommitdiffstats
path: root/system/libraries/Upload.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-01-03 10:01:50 +0100
committerAndrey Andreev <narf@bofh.bg>2012-01-03 10:01:50 +0100
commit166396ed9e03f78444970372983d50fd34a5ca96 (patch)
treef209bdbc89c0e4310ebf772299e0bd7e7ecef68d /system/libraries/Upload.php
parentb195637240bbbc7c3dc7ee0585f0e4cd39cb9d81 (diff)
parent29e1122c19c532b7299598fb7ddfb7f15264ad78 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-xmlrpc
Diffstat (limited to 'system/libraries/Upload.php')
-rw-r--r--system/libraries/Upload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 826bcceb8..0c63886e7 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -18,7 +18,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
* @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
* @link http://codeigniter.com
* @since Version 1.0