summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-09-14 18:26:07 +0200
committerTimothy Warren <tim@timshomepage.net>2011-09-14 18:26:07 +0200
commite113080cff02502a9dc6fe80076f0316708e7acf (patch)
treed7326283d3ef9783f530342cd8db4c04ce792cd9 /system/libraries
parentc7ba6640fcd1acfd5865efb5780607c90efc0e24 (diff)
parentb6e921dddd11a7c711d7a4cddab4074ebc484362 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Form_validation.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index a34809e05..c78583f4f 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1079,7 +1079,7 @@ class CI_Form_validation {
*
* @access public
* @param string
- * @return string
+ * @return bool
*/
public function valid_ip($ip)
{