]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge branch 'dev' of github.com:inthepoche/poche into dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Fri, 23 Aug 2013 19:15:39 +0000 (21:15 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Fri, 23 Aug 2013 19:15:39 +0000 (21:15 +0200)
commitd9afe1abd7baa5dcda362bb247f5bdecafe30048
tree7f196ec5f7693499e25d68aba95fbd1a1ef8f0c8
parent70c39d16185698c0cc937cc4104694cd97e36d33
parentc2618ca7917b6566d3e0406a2ccbe6c936327837
Merge branch 'dev' of github.com:inthepoche/poche into dev
tpl/home.twig
tpl/view.twig