]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'axelsimon-patch-1' into dev
authorNicolas Lœuillet <nicolas.loeuillet@smile.fr>
Fri, 31 Jul 2015 11:22:57 +0000 (13:22 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@smile.fr>
Fri, 31 Jul 2015 11:22:57 +0000 (13:22 +0200)
1  2 
themes/baggy/config.twig

Simple merge