]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge remote-tracking branch 'origin/master' into 2.2 2416/head
authorJeremy Benoist <jeremy.benoist@gmail.com>
Thu, 26 Jan 2017 12:32:07 +0000 (13:32 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Thu, 26 Jan 2017 12:32:07 +0000 (13:32 +0100)
commit78295b99dd1721c613f1ce52e2debbe6f6db7753
treee76f3e8142399316ec5660fab8c646b2c34b8336
parent463cb376e357d50c5913452fba68a70bf43492c9
parent05fa529bcfde01be5d320cb532900d72cf4b0830
Merge remote-tracking branch 'origin/master' into 2.2
app/config/config.yml
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig