diff options
| author | Andrey Andreev <narf@devilix.net> | 2018-01-09 10:32:02 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2018-01-09 10:38:30 +0100 |
| commit | cce6bd170f24cf0f10ca0b58150d0324433a66be (patch) | |
| tree | 367772ab6ca66dc40abb3cb8e9ac7733ba18f401 /system/libraries/Typography.php | |
| parent | 97e50f72d5920c13d15a0178f5065b06d6e53903 (diff) | |
[ci skip] Merge pull request #5376 from jim-parry/copyright-update
Annual copyright update
Conflicts resolved:
system/libraries/Cache/drivers/Cache_apcu.php
Diffstat (limited to 'system/libraries/Typography.php')
| -rw-r--r-- | system/libraries/Typography.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index b25d8fdaa..bfc993472 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -6,7 +6,7 @@ * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014 - 2017, British Columbia Institute of Technology + * Copyright (c) 2014 - 2018, 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 - 2017, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2018, 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 |