]> git.immae.eu Git - github/wallabag/wallabag.git/commit
fix merge confict
authorThomas Citharel <tcit@tcit.fr>
Wed, 19 Nov 2014 15:54:28 +0000 (16:54 +0100)
committerThomas Citharel <tcit@tcit.fr>
Wed, 19 Nov 2014 15:54:28 +0000 (16:54 +0100)
commite9d4d17693e2d85f1a17a29f3e82e5d0235a10ad
treea17b5939046b29742d2d54e2b28a95dc6c9e5936
parentd25a3f13c2617d6d3f6d6433d426fab47727f038
parent25f9c668348ae8d15e557bafc0e4aff2e2477e87
fix merge confict
inc/poche/config.inc.default.php
themes/baggy/view.twig
themes/courgette/_view.twig
themes/default/view.twig