]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of github.com:inthepoche/poche into dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Sun, 25 Aug 2013 18:10:34 +0000 (20:10 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Sun, 25 Aug 2013 18:10:34 +0000 (20:10 +0200)
1  2 
tpl/config.twig

diff --cc tpl/config.twig
Simple merge