diff options
| author | Ronald Beilsma <beilsma@gmail.com> | 2012-01-10 15:45:31 +0100 |
|---|---|---|
| committer | Ronald Beilsma <beilsma@gmail.com> | 2012-01-10 15:45:31 +0100 |
| commit | 25dcb93d05bd098e89188ea0691adf72228bd131 (patch) | |
| tree | 37d3d769f2e64bebb48a98378c7aee3ab4c17efe /system/libraries/Encrypt.php | |
| parent | db66eb38cfc4a2ab6c8816b8f7663211232d4f4e (diff) | |
| parent | e9a5a862a1252548b463aa738e50e8d9bfd01379 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Encrypt.php')
| -rw-r--r-- | system/libraries/Encrypt.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 92b0b3c4a..e297576e6 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.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 |