diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-17 15:46:28 +0200 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-17 15:46:28 +0200 |
commit | 918eaef728eaf49387083b39add7106e029fcfb4 (patch) | |
tree | bd7ae7ad33977cf04cd44a735ccc1465ab7b4ffc /user_guide/general/reserved_names.html | |
parent | 0199f68db46d375af2d4cb831c679d3040601f25 (diff) | |
parent | 324ef078dda5a3596444152ba49dd591a61adba6 (diff) |
Merge branch 'release/2.1.1'
Diffstat (limited to 'user_guide/general/reserved_names.html')
-rw-r--r-- | user_guide/general/reserved_names.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 450c0f667..80df6fd11 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -28,7 +28,7 @@ <div id="masthead"> <table cellpadding="0" cellspacing="0" border="0" style="width:100%"> <tr> -<td><h1>CodeIgniter User Guide Version 2.1.0</h1></td> +<td><h1>CodeIgniter User Guide Version 2.1.1</h1></td> <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td> </tr> </table> @@ -121,7 +121,7 @@ Previous Topic: <a href="controllers.html">Controllers</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="views.html">Views</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> |