]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' into randomarticle
authorThomas Citharel <tcit@tcit.fr>
Mon, 22 Dec 2014 13:33:01 +0000 (14:33 +0100)
committerThomas Citharel <tcit@tcit.fr>
Mon, 22 Dec 2014 13:33:01 +0000 (14:33 +0100)
1  2 
themes/baggy/home.twig
themes/default/home.twig

Simple merge
Simple merge