summaryrefslogtreecommitdiffstats
path: root/application/config/profiler.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-11-11 13:33:16 +0100
committerAndrey Andreev <narf@devilix.net>2014-11-11 13:33:16 +0100
commit8f7d3d2fccc097c85cc403b58df6c5fc35418579 (patch)
tree5bc1ef2a75abb0d85a3ab2cece365eed9e516470 /application/config/profiler.php
parent4f50256a84e8052fc3356683f28286d36f8a322c (diff)
parent81c934729d9fcbb294a8914608c315eed30ff9c4 (diff)
Fix merge conflicts
Diffstat (limited to 'application/config/profiler.php')
-rw-r--r--application/config/profiler.php39
1 files changed, 25 insertions, 14 deletions
diff --git a/application/config/profiler.php b/application/config/profiler.php
index f99e109db..9778e8cf4 100644
--- a/application/config/profiler.php
+++ b/application/config/profiler.php
@@ -4,24 +4,35 @@
*
* An open source application development framework for PHP 5.2.4 or newer
*
- * NOTICE OF LICENSE
+ * This content is released under the MIT License (MIT)
*
- * Licensed under the Academic Free License version 3.0
+ * Copyright (c) 2014, British Columbia Institute of Technology
*
- * This source file is subject to the Academic Free License (AFL 3.0) that is
- * bundled with this package in the files license_afl.txt / license_afl.rst.
- * It is also available through the world wide web at this URL:
- * http://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to obtain it
- * through the world wide web, please send an email to
- * licensing@ellislab.com so we can send you a copy immediately.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * @package CodeIgniter
- * @author EllisLab Dev Team
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package CodeIgniter
+ * @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
- * @link http://codeigniter.com
- * @since Version 1.0
+ * @copyright Copyright (c) 2014, 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
* @filesource
*/
defined('BASEPATH') OR exit('No direct script access allowed');