summaryrefslogtreecommitdiffstats
path: root/system/libraries/Javascript.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-01-11 11:33:37 +0100
committerAndrey Andreev <narf@devilix.net>2016-01-11 11:33:37 +0100
commit9b2c17ed78f0e6e08a96e176ef640fca675dd0a6 (patch)
treef99c7648e74c0b7fe139b8824dc0abd24de613ee /system/libraries/Javascript.php
parent38b08116c61c0a68e6d350c986f75589220692ed (diff)
parent125ef4751080a2118cb203357d77687699e3eb25 (diff)
Merge branch '3.0-stable' into develop
Diffstat (limited to 'system/libraries/Javascript.php')
-rw-r--r--system/libraries/Javascript.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index 4cc628692..8e3180adc 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -6,7 +6,7 @@
*
* This content is released under the MIT License (MIT)
*
- * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2016, 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. (http://ellislab.com/)
- * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link http://codeigniter.com
* @since Version 1.0.0