]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge remote-tracking branch 'origin/master' into 2.4
authorJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 25 Nov 2018 08:58:18 +0000 (09:58 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 25 Nov 2018 08:58:18 +0000 (09:58 +0100)
commitb878be4cc99fd4927c70b59386cf7a57b33bb381
tree9a5186ead93b9f6114b5341a7713f614eb58f6ec
parente673b54f702f274a087e4feff409663d9636e57b
parentbffe65478de71113a16f6e7a7ef75845c9d61180
Merge remote-tracking branch 'origin/master' into 2.4

# Conflicts:
# web/wallassets/baggy.js
# web/wallassets/manifest.json
# web/wallassets/material.css
# web/wallassets/material.js
13 files changed:
app/Resources/static/themes/material/css/cards.scss
composer.json
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
web/wallassets/material.css