]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge remote-tracking branch 'origin/master' into 2.3
authorJeremy Benoist <jeremy.benoist@gmail.com>
Mon, 1 May 2017 20:15:46 +0000 (22:15 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Mon, 1 May 2017 20:15:46 +0000 (22:15 +0200)
1  2 
composer.json
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml

diff --cc composer.json
Simple merge