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

diff --cc README.md
Simple merge
Simple merge