]> git.immae.eu Git - github/wallabag/wallabag.git/commit - themes/baggy/view.twig
Merge branch 'remove-courgette' into dev
authorThomas Citharel <tcit@tcit.fr>
Mon, 24 Nov 2014 21:56:10 +0000 (22:56 +0100)
committerThomas Citharel <tcit@tcit.fr>
Mon, 24 Nov 2014 21:56:10 +0000 (22:56 +0100)
commitb9c026ce32abed7295d2775640edc0ef89017723
tree3492511dde4bb1b3ad5e95ef918a68d5f5418d64
parent485d57972ee3c3219652454ff6d7d82a3602bd34
parent85c5a1ff8d919d3d36a8125c9bbd0d9220025729
Merge branch 'remove-courgette' into dev

Conflicts:
themes/courgette/_view.twig