| commit | 2117fa210fd3efdcf628f9bcff76bb311e7c0911 | [log] [tgz] |
|---|---|---|
| author | Lance Vincent <lancevincent@gmail.com> | Wed Jan 28 17:46:35 2015 +0800 |
| committer | Lance Vincent <lancevincent@gmail.com> | Wed Jan 28 17:46:35 2015 +0800 |
| tree | a0b0241bc5dba0ab6eb0ac04ee37a3c6f71ef841 | |
| parent | eca885df9d2c763f97fca04c5fec14ee420b0fa3 [diff] | |
| parent | d62e7bc8f2f760e8c05a73df266951a2af817c83 [diff] |
Merge remote-tracking branch 'origin/develop' into develop Conflicts: system/language/english/form_validation_lang.php system/libraries/Form_validation.php user_guide_src/source/libraries/form_validation.rst