]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
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)
Conflicts:
themes/courgette/_view.twig


Trivial merge