From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 1 May 2017 20:15:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.3
X-Git-Tag: 2.3.0~31^2~114
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e1d64050ad6f54e45d3954ffac21daaee58c6240;hp=3cbb0cc3ef89873a06bda6583747a2660b989fb8;p=github%2Fwallabag%2Fwallabag.git

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

diff --git a/.gitignore b/.gitignore
index 84fb95d7..0bcbabb8 100644
--- 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 5f9e6c1d..bfd42339 100644
--- 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 7da9fe6b..42a12b2a 100644
--- 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'