diff options
| author | Florian Pritz <bluewind@xinu.at> | 2019-01-28 15:54:04 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2019-01-28 15:54:04 +0100 |
| commit | b4841bc83374052c46fbc3f4a223484199546fd8 (patch) | |
| tree | 385733a716c03b576335e5bb98361c13e92138f3 /system/helpers/smiley_helper.php | |
| parent | 98f7c65dddf0667f1a0462e08be9e6273ce658fb (diff) | |
| parent | c576995304fc3609cca0b7b92d1b2cd611ec82f5 (diff) | |
Merge tag '3.1.10' of git://github.com/bcit-ci/CodeIgniter into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/helpers/smiley_helper.php')
| -rw-r--r-- | system/helpers/smiley_helper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index b7f1d2e1a..321e59cef 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -6,7 +6,7 @@ * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014 - 2018, British Columbia Institute of Technology + * Copyright (c) 2014 - 2019, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) - * @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License * @link https://codeigniter.com * @since Version 1.0.0 |