diff options
| author | Eric Barnes <eric@ericlbarnes.com> | 2011-11-27 06:30:22 +0100 |
|---|---|---|
| committer | Eric Barnes <eric@ericlbarnes.com> | 2011-11-27 06:30:22 +0100 |
| commit | 7e66dda705743cbfe1d522ddb73e5694006ec42c (patch) | |
| tree | c08b63deb28c09ec49d9173280f1ca234debfe50 /system/helpers/directory_helper.php | |
| parent | 7eceb03f083643254c7393c6b5ebe539e344a1ba (diff) | |
| parent | e101593561a10632c1d63180436b19f1d7115046 (diff) | |
Merge branch 'refs/heads/develop' into feature/unit-tests
Conflicts:
user_guide/helpers/number_helper.html
Diffstat (limited to 'system/helpers/directory_helper.php')
| -rw-r--r-- | system/helpers/directory_helper.php | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php index 38347fa62..cb37446f8 100644 --- a/system/helpers/directory_helper.php +++ b/system/helpers/directory_helper.php @@ -4,10 +4,22 @@ * * An open source application development framework for PHP 5.1.6 or newer * + * NOTICE OF LICENSE + * + * Licensed under the Open Software License version 3.0 + * + * This source file is subject to the Open Software License (OSL 3.0) that is + * bundled with this package in the files license.txt / license.rst. It is + * also available through the world wide web at this URL: + * http://opensource.org/licenses/OSL-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. + * * @package CodeIgniter - * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. - * @license http://codeigniter.com/user_guide/license.html + * @author EllisLab Dev Team + * @copyright Copyright (c) 2008 - 2011, 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 * @filesource @@ -21,7 +33,7 @@ * @package CodeIgniter * @subpackage Helpers * @category Helpers - * @author ExpressionEngine Dev Team + * @author EllisLab Dev Team * @link http://codeigniter.com/user_guide/helpers/directory_helper.html */ |