| commit | b9e35f21e1c70b6aa67c47e9244ed83195abc00a | [log] [tgz] |
|---|---|---|
| author | Eric Roberts <eric@cryode.com> | Wed Dec 12 07:02:11 2012 -0600 |
| committer | Eric Roberts <eric@cryode.com> | Wed Dec 12 07:02:11 2012 -0600 |
| tree | 64f82db362deeac48cc20d1d1afd80651f36f5a5 | |
| parent | 0b05705c52c3bca7f9b3aee657c888e8ad1ff422 [diff] | |
| parent | 545a7c86701875e1412bcde316e9bcc76d9a23a0 [diff] |
Merge branch 'refs/heads/develop' into feature/form_error_msgs Conflicts: system/language/english/form_validation_lang.php user_guide_src/source/libraries/form_validation.rst Signed-off-by: Eric Roberts <eric@cryode.com>