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

diff --git a/.gitignore b/.gitignore
index 84fb95d7e5471ecdd0db841ebcc7906fe53a41fe..0bcbabb8c585339c0b8e197605a04b12e7c13b18 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,7 @@ bin
 app/Resources/build/
 !/src/Wallabag/CoreBundle/Resources/public
 /src/Wallabag/CoreBundle/Resources/public/*
+
+# Test-generated files
+admin-export.json
+specialexport.json

diff --git a/composer.json b/composer.json
index 5f9e6c1d2756f3bdf3dfa9924f9e7d66e45c09a3..bfd42339b1e0bf6fbe2683578b1e5a7fbefe4ed2 100644 (file)
--- 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"
         }

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 7da9fe6b7cec186f73de9530596712f98ecd3544..42a12b2a7b5035f75f2159995bf61d63c0eb5554 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -361,7 +361,7 @@ quickstart:
     developer:
         title: 'Developers'
         description: 'We also thought to the developers: Docker, API, translations, etc.'
-        create_application: 'Create your third application'
+        create_application: 'Create your third-party application'
         use_docker: 'Use Docker to install wallabag'
     docs:
         title: 'Full documentation'