diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-04 20:45:14 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-04 20:45:14 +0100 |
| commit | 0f2cb79b976086cb73140c25f4c568e865177426 (patch) | |
| tree | e67e0247e540ea8be6c7b37f627c4b13c0f0a586 /system/helpers/smiley_helper.php | |
| parent | ef38f0a6d83025fbd99ace5ec60311acfe9121c4 (diff) | |
| parent | e30e400581a663045486985d0e75bc77631a2ef2 (diff) | |
Merged develop and fixed conflicts.
Diffstat (limited to 'system/helpers/smiley_helper.php')
| -rw-r--r-- | system/helpers/smiley_helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 38e2965fc..700f4486c 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.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 |