From 0b39f6de6a5df48e428f85ee2e02cb9fb61cd8f1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 09 Nov 2014 10:03:47 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 UPGRADING |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 86ddde6..358e266 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -40,15 +40,18 @@
    directory into the target folder:
    ./skins/
    ./plugins/
-4. Run ./bin/update.sh from the commandline OR
+   ./vendor/
+4. Run `./bin/update.sh` from the commandline OR
    open http://url-to-roundcube/installer/ in a browser and choose "3 Test config".
    To enable the latter one, you have to temporary set 'enable_installer'
    to true in your local config/config.inc.php file.
    WARNING: See SQLite database upgrade below.
 5. Let the update script/installer check your configuration and
    update your config files and database schema as suggested by the updater.
-6. Make sure 'enable_installer' is set to false again.
-7. See Post-Upgrade Activities section.
+5. If you previously installed plugins through composer, update dependencies
+   by running `php composer.phar update --no-dev`
+7. Make sure 'enable_installer' is set to false again.
+8. See Post-Upgrade Activities section.
 
 
 Post-Upgrade Activities

--
Gitblit v1.9.1