diff options
author | Pascal Kriete <pascal@pascalkriete.com> | 2011-11-14 21:15:15 +0100 |
---|---|---|
committer | Pascal Kriete <pascal@pascalkriete.com> | 2011-11-14 21:15:15 +0100 |
commit | f525f10c850399700a4cce183aef55656ff44d31 (patch) | |
tree | d0250655551d773c9347573e594997e07d7280a5 /user_guide/helpers/smiley_helper.html | |
parent | 44cdece942c310f5520497dbde4febc26e96c27e (diff) | |
parent | 917c3455cc70d5117daa7359f345a820154ada3e (diff) |
Merge branch 'release/2.1.0'
Conflicts:
user_guide/helpers/url_helper.html
Diffstat (limited to 'user_guide/helpers/smiley_helper.html')
-rw-r--r-- | user_guide/helpers/smiley_helper.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 6f1fa5915..8bdd1df2c 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.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.0.3</h1></td> +<td><h1>CodeIgniter User Guide Version 2.1.0</h1></td> <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td> </tr> </table> |