]> git.immae.eu Git - github/wallabag/wallabag.git/commit - src/Wallabag/CoreBundle/Resources/public/themes/_global/js/bookmarklet.js
Merge remote-tracking branch 'origin/master' into 2.1
authorJeremy Benoist <jeremy.benoist@gmail.com>
Wed, 20 Jul 2016 10:02:02 +0000 (12:02 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Wed, 20 Jul 2016 10:02:02 +0000 (12:02 +0200)
commit0faeabefa7faedb3a6a3675a5e49e947554adae9
treee51ae7db64408b159b2dfa13bfa9e01530223dc9
parent2bb138ef6df2d1a608b42907185b274fb87f4513
parent317fc6e684356b645ea1327c2631c7d5fc193ddd
Merge remote-tracking branch 'origin/master' into 2.1
.gitignore
.travis.yml
app/config/config.yml
app/config/config_dev.yml
composer.json
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig