diff --git a/composer.lock b/composer.lock index 169d950e30..8f45e4b7fb 100644 --- a/composer.lock +++ b/composer.lock @@ -49,6 +49,18 @@ "source-reference": "v2.2.3", "commit-date": "1339767845" }, + { + "package": "guzzle/common", + "version": "v2.8.2" + }, + { + "package": "guzzle/http", + "version": "v2.8.2" + }, + { + "package": "guzzle/parser", + "version": "v2.8.2" + }, { "package": "imagine/Imagine", "version": "dev-develop", @@ -104,8 +116,8 @@ { "package": "phpexiftool/phpexiftool", "version": "dev-master", - "source-reference": "5dc6e9a21e4b0faf6809070bc4f1cc4fef06ead6", - "commit-date": "1339680734" + "source-reference": "3e63a2713cfb15efdc7aa6b49e61080c31b5310d", + "commit-date": "1343328301" }, { "package": "pimple/pimple", @@ -206,8 +218,8 @@ { "package": "behat/mink-extension", "version": "dev-master", - "source-reference": "da58c1b572349310ce5b65066a4d8b7e487a63a7", - "commit-date": "1342818063" + "source-reference": "bef6818b9538ef9ba75d1f5845fe71c1f5621ad1", + "commit-date": "1343146519" }, { "package": "behat/mink-goutte-driver", @@ -230,18 +242,14 @@ { "package": "fabpot/goutte", "version": "dev-master", - "source-reference": "c2ea8d9a6682d14482e57ede2371001b8a5238d2", - "commit-date": "1340264258" + "source-reference": "df14259688c7d6f1d366aa073a589695d2b9f451", + "commit-date": "1343194442" }, { "package": "fabpot/php-cs-fixer", "version": "dev-master", - "source-reference": "4c4bc75cc179ff91bb83960ae7dacca6754d2c46", - "commit-date": "1342957711" - }, - { - "package": "guzzle/guzzle", - "version": "v2.6.6" + "source-reference": "55701d65622b72cbe0db8d8f9136d36e45b2f7f4", + "commit-date": "1343202851" }, { "package": "instaclick/php-webdriver", diff --git a/lib/classes/appbox.class.php b/lib/classes/appbox.class.php index 8259b2cd82..a9def2f024 100644 --- a/lib/classes/appbox.class.php +++ b/lib/classes/appbox.class.php @@ -366,7 +366,7 @@ class appbox extends base */ $upgrader->set_current_message(_('Copying files')); - $origine = $registry->get('GV_RootPath') . 'config/'; + $origine = $registry->get('GV_RootPath') . 'config/custom_files/'; $target = $registry->get('GV_RootPath') . 'www/custom/'; $filesystem = $core['file-system'];