summaryrefslogtreecommitdiffstats
path: root/DCO.txt
diff options
context:
space:
mode:
authorLance Vincent <lancevincent@gmail.com>2015-01-28 10:46:35 +0100
committerLance Vincent <lancevincent@gmail.com>2015-01-28 10:46:35 +0100
commit2117fa210fd3efdcf628f9bcff76bb311e7c0911 (patch)
treea0b0241bc5dba0ab6eb0ac04ee37a3c6f71ef841 /DCO.txt
parenteca885df9d2c763f97fca04c5fec14ee420b0fa3 (diff)
parentd62e7bc8f2f760e8c05a73df266951a2af817c83 (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
Diffstat (limited to 'DCO.txt')
0 files changed, 0 insertions, 0 deletions