]> git.immae.eu Git - github/wallabag/wallabag.git/commit
resolve conflicts
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Fri, 23 Aug 2013 21:18:36 +0000 (23:18 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Fri, 23 Aug 2013 21:18:36 +0000 (23:18 +0200)
commit38b418b7d63783fa0c7b920b7de6a1f6930fc7cb
tree3d2a95c3c74130c31ee3e21d540ccae0504ee17c
parentd29b3e5f9e195b99d3891acd8537f8f4680e430f
parentfa5f9764ae370d6eb5efd6b05bf8e257aae9899d
resolve conflicts
tpl/config.twig
tpl/layout.twig