mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-22 23:56:29 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Jeremy Benoist 2017-05-01 22:15:46 +02:00
commit e1d64050ad
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -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

2
composer.json
View file

@ -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"
}

2
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
View file

@ -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'