summaryrefslogtreecommitdiffstats
path: root/tests/README.md
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-06-19 11:02:53 +0200
committerAndrey Andreev <narf@devilix.net>2017-06-19 11:02:53 +0200
commit8186b6b398c26c0c1e0052eaddf4fc122e4929a5 (patch)
tree0290ebd53dd9b5167680e80e22342d751001fe56 /tests/README.md
parentaf5c8960d80a9db362722ca675ffddb2079bbce9 (diff)
parent47f540e82cbc1591cc7f1aa92d47a8c8c4028c63 (diff)
Merge branch '3.1-stable' into develop
Conflicts resolved: system/core/CodeIgniter.php tests/codeigniter/libraries/Form_validation_test.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst
Diffstat (limited to 'tests/README.md')
0 files changed, 0 insertions, 0 deletions