summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/installation
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2020-01-28 20:16:56 +0100
committerAndrey Andreev <narf@devilix.net>2020-01-28 20:16:56 +0100
commit2b96e73d85365fb05a56e7464cdb341fd5a9d7b8 (patch)
tree7e6a7d5805e1a94abe92f7db43727da739877aed /user_guide_src/source/installation
parentddfe81730f43b20092383165911c5b1c92d4e5f3 (diff)
parentced499f7ad90ff8bb6bf0faa2e24a1593204de9a (diff)
Merge branch '3.1-stable' into develop
Conflicts resolved: .travis.yml system/database/DB_query_builder.php system/helpers/captcha_helper.php system/libraries/Cache/drivers/Cache_redis.php system/libraries/Zip.php
Diffstat (limited to 'user_guide_src/source/installation')
-rw-r--r--user_guide_src/source/installation/upgrade_3112.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/user_guide_src/source/installation/upgrade_3112.rst b/user_guide_src/source/installation/upgrade_3112.rst
index 9c849d878..1000010ab 100644
--- a/user_guide_src/source/installation/upgrade_3112.rst
+++ b/user_guide_src/source/installation/upgrade_3112.rst
@@ -12,3 +12,9 @@ Replace all files and directories in your *system/* directory.
.. note:: If you have any custom developed files in these directories,
please make copies of them first.
+
+Step 2: Replace config/user_agents.php
+================================
+
+This config file has received some updates. Please copy it to
+*application/config/user_agents.php*.