summaryrefslogtreecommitdiffstats
path: root/user_guide/license.html
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-02-02 22:19:25 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-02-02 22:19:25 +0100
commitd88b31550ae2aeb0e3bcc11ba82d4838f8a5fd31 (patch)
tree792bff97d41430b5c36a08c8ec3ac54db97375b6 /user_guide/license.html
parent5c59c7dc3254616b18057922ce012f22c18b147b (diff)
parent75f5ff5d99533a423e68686d89889d172c37d98e (diff)
Merged recent changes and tweaked multi-env changes.
Diffstat (limited to 'user_guide/license.html')
-rw-r--r--user_guide/license.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide/license.html b/user_guide/license.html
index c76035d16..bb01a7e8d 100644
--- a/user_guide/license.html
+++ b/user_guide/license.html
@@ -60,7 +60,7 @@ License Agreement
<h1>CodeIgniter License Agreement</h1>
-<p>Copyright (c) 2008 - 2010, EllisLab, Inc.<br />
+<p>Copyright (c) 2008 - 2011, EllisLab, Inc.<br />
All rights reserved.</p>
<p>This license is a legal agreement between you and EllisLab Inc. for the use of CodeIgniter Software (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.</p>
@@ -100,7 +100,7 @@ Previous Topic:&nbsp;&nbsp;<a href="general/requirements.html">Server Requiremen
<a href="index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="changelog.html">Change Log</a>
</p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
</div>
</body>