Merge remote-tracking branch 'origin/master' into 2.3

2017-05-01 22:15:46 +02:00
parent 3cbb0cc3ef 9579003045
commit e1d64050ad
3 changed files with 6 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@ -115,7 +115,7 @@
        "symfony-var-dir": "var",
        "symfony-web-dir": "web",
        "symfony-tests-dir": "tests",
-        "symfony-assets-install": "symlink",
+        "symfony-assets-install": "relative",
        "incenteev-parameters": {
            "file": "app/config/parameters.yml"
        }