diff options
author | Pascal Kriete <pascal.kriete@ellislab.com> | 2011-01-07 21:05:47 +0100 |
---|---|---|
committer | Pascal Kriete <pascal.kriete@ellislab.com> | 2011-01-07 21:05:47 +0100 |
commit | 3ef0d283693178ceec9e9e4fb6b0d22538c3af34 (patch) | |
tree | 9d9b78bed047f7cbfc4873d2dcba50173cd3be0b /user_guide/license.html | |
parent | 43ded2351b2703bf6fc6d9d0b2311cb08194d4bf (diff) | |
parent | 0711dc87d98ce20d3a87f7ac43d78af8fba1dca7 (diff) |
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'user_guide/license.html')
-rw-r--r-- | user_guide/license.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/license.html b/user_guide/license.html index c76035d16..96ca53a70 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> |