diff options
| author | Timothy Warren <tim@timshomepage.net> | 2011-10-21 14:29:34 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2011-10-21 14:29:34 +0200 |
| commit | 8e66cd7e24488de5524ad1a69f50af2fd6cd9180 (patch) | |
| tree | 30a5d4f69d9cdde45f9b4ceb6d9117a327de6ef5 /application/errors | |
| parent | fb53330ca179c201912b4517f4bdbdde4b2c095a (diff) | |
| parent | 61df9060d468ce28c40ee4a57d108763f80ec583 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/errors')
| -rw-r--r-- | application/errors/error_404.php | 2 | ||||
| -rw-r--r-- | application/errors/error_db.php | 2 | ||||
| -rw-r--r-- | application/errors/error_general.php | 2 | ||||
| -rw-r--r-- | application/errors/error_php.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/application/errors/error_404.php b/application/errors/error_404.php index 6a34cae72..eb98deb71 100644 --- a/application/errors/error_404.php +++ b/application/errors/error_404.php @@ -8,7 +8,7 @@ * * Licensed under the Academic Free License version 3.0 * - * This source file is subject to the Open Software License (OSL 3.0) that is + * 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 diff --git a/application/errors/error_db.php b/application/errors/error_db.php index 3aa15f532..a53c38992 100644 --- a/application/errors/error_db.php +++ b/application/errors/error_db.php @@ -8,7 +8,7 @@ * * Licensed under the Academic Free License version 3.0 * - * This source file is subject to the Open Software License (OSL 3.0) that is + * 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 diff --git a/application/errors/error_general.php b/application/errors/error_general.php index a0509c6bf..7d9a29f4e 100644 --- a/application/errors/error_general.php +++ b/application/errors/error_general.php @@ -8,7 +8,7 @@ * * Licensed under the Academic Free License version 3.0 * - * This source file is subject to the Open Software License (OSL 3.0) that is + * 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 diff --git a/application/errors/error_php.php b/application/errors/error_php.php index 4a8c9a8ce..ec2a3f10a 100644 --- a/application/errors/error_php.php +++ b/application/errors/error_php.php @@ -8,7 +8,7 @@ * * Licensed under the Academic Free License version 3.0 * - * This source file is subject to the Open Software License (OSL 3.0) that is + * 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 |