aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--composer.json2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml2
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 84fb95d7..0bcbabb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,7 @@ bin
51app/Resources/build/ 51app/Resources/build/
52!/src/Wallabag/CoreBundle/Resources/public 52!/src/Wallabag/CoreBundle/Resources/public
53/src/Wallabag/CoreBundle/Resources/public/* 53/src/Wallabag/CoreBundle/Resources/public/*
54
55# Test-generated files
56admin-export.json
57specialexport.json
diff --git a/composer.json b/composer.json
index 5f9e6c1d..bfd42339 100644
--- a/composer.json
+++ b/composer.json
@@ -115,7 +115,7 @@
115 "symfony-var-dir": "var", 115 "symfony-var-dir": "var",
116 "symfony-web-dir": "web", 116 "symfony-web-dir": "web",
117 "symfony-tests-dir": "tests", 117 "symfony-tests-dir": "tests",
118 "symfony-assets-install": "symlink", 118 "symfony-assets-install": "relative",
119 "incenteev-parameters": { 119 "incenteev-parameters": {
120 "file": "app/config/parameters.yml" 120 "file": "app/config/parameters.yml"
121 } 121 }
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:
361 developer: 361 developer:
362 title: 'Developers' 362 title: 'Developers'
363 description: 'We also thought to the developers: Docker, API, translations, etc.' 363 description: 'We also thought to the developers: Docker, API, translations, etc.'
364 create_application: 'Create your third application' 364 create_application: 'Create your third-party application'
365 use_docker: 'Use Docker to install wallabag' 365 use_docker: 'Use Docker to install wallabag'
366 docs: 366 docs:
367 title: 'Full documentation' 367 title: 'Full documentation'