]> git.immae.eu Git - github/wallabag/wallabag.git/commit - src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
Merge remote-tracking branch 'origin/v2' into v2_material
authorAlexandr Danilov <bitbucket@modos189.ru>
Wed, 12 Aug 2015 20:02:19 +0000 (23:02 +0300)
committerAlexandr Danilov <bitbucket@modos189.ru>
Wed, 12 Aug 2015 20:02:19 +0000 (23:02 +0300)
commita737d2a0eeb23588fd8659471c41df0a6b95705a
tree1a8ca25a33a6f5fb19445a9bf5c753aa9a22b9c9
parent392f4a2681d94b8af8e2725aa6ca4615329afa54
parent545b852f4694d1d9821bb4d13d6a1f3e0e7634fb
Merge remote-tracking branch 'origin/v2' into v2_material
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig