summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/changelog.rst
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide_src/source/changelog.rst')
-rw-r--r--user_guide_src/source/changelog.rst12
1 files changed, 11 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 66eff1ba5..3a2990b2c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,11 +2,21 @@
Change Log
##########
-Version 2.1.0 (planned)
+Version 3.0 (planned)
=======================
Release Date: Not Released
+- License
+
+ - CodeIgniter has been relicensed with the Open Software License (3.0),
+ eliminating its old proprietary licensing.
+
+ - All system files are licensed with OSL 3.0.
+ - Config, error, and sample files shipped in the application folder are
+ licensed with the Academic Free License (3.0) to allow you to retain
+ all licensing authority over your own application code.
+
- General Changes
- Added an optional backtrace to php-error template.