summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/installation/upgrade_320.rst
AgeCommit message (Collapse)AuthorFilesLines
2016-12-01Fix steps numbering in 3.2.0 upgrade instructionsAndrey Andreev1-2/+2
Broken in d76431db46e04d650c1c538493021cdf336d1301
2016-12-01Switch CI_Email::$validate to On by defaultAndrey Andreev1-0/+14
Relevant: #4844
2016-07-26Merge branch '3.1-stable' into developAndrey Andreev1-0/+112
Conflicts resolved: .travis.yml system/core/CodeIgniter.php system/database/drivers/oci8/oci8_forge.php system/database/drivers/pdo/subdrivers/pdo_oci_forge.php system/helpers/path_helper.php system/libraries/Email.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/contributing/index.rst user_guide_src/source/general/requirements.rst user_guide_src/source/general/styleguide.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrade_310.rst user_guide_src/source/installation/upgrading.rst