]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge remote-tracking branch 'origin/master' into 2.1
authorJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 28 Aug 2016 14:15:27 +0000 (16:15 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 28 Aug 2016 14:15:27 +0000 (16:15 +0200)
commitcdd3010b478c9ca818dd6d22d03c81ef4a5ab208
treeffc9957fc228625501214bbb2e9f4bebe7936982
parent13d44ca766b1020327f0b9b005dc2e95deb156a1
parent985f5f9d05f7ff7e443442b1775923b379c141d6
Merge remote-tracking branch 'origin/master' into 2.1
.travis.yml
app/Resources/static/themes/material/css/main.css
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
src/Wallabag/UserBundle/Resources/views/Security/login.html.twig