diff options
author | Pascal Kriete <pascal@pascalkriete.com> | 2011-08-12 18:54:13 +0200 |
---|---|---|
committer | Pascal Kriete <pascal@pascalkriete.com> | 2011-08-12 18:54:13 +0200 |
commit | c4f024641ab69ed9cce62a2864e47e060b81048b (patch) | |
tree | a4de86c0c6e95e6042ce66e84bdcd0c18c51d643 /user_guide/helpers | |
parent | abccc2fa65eea5f64773952661a8ba79e559333b (diff) | |
parent | b0eae5f81a4cb92911bb215ad814ae5caef4f61d (diff) |
Merging - fingers crossed
Conflicts:
system/database/drivers/mysql/mysql_driver.php
system/database/drivers/mysqli/mysqli_driver.php
system/libraries/Email.php
user_guide/changelog.html
user_guide/database/configuration.html
user_guide/helpers/url_helper.html
user_guide/libraries/cart.html
user_guide/libraries/form_validation.html
Diffstat (limited to 'user_guide/helpers')
-rw-r--r-- | user_guide/helpers/url_helper.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index de28a6f56..ac9d0a68e 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -27,7 +27,7 @@ <div id="masthead"> <table cellpadding="0" cellspacing="0" border="0" style="width:100%"> <tr> -<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td> +<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td> <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td> </tr> </table> |