]> git.immae.eu Git - github/wallabag/wallabag.git/commit
fix merge errors
authortcit <tcit@tcit.fr>
Fri, 31 Oct 2014 17:54:08 +0000 (18:54 +0100)
committertcit <tcit@tcit.fr>
Fri, 31 Oct 2014 17:54:08 +0000 (18:54 +0100)
commita63cd1b06ff74edbb47b9f4dae16268e1737c13a
tree6cd7efaae2395582422803e3678485f8b959aeb0
parentccaefcf69a5e2e9404a40b7377fbdfe9627c0320
parent15eb5ca4b83710059c1bb7a7a6aa270ed3cb704c
fix merge errors
themes/baggy/_search-form.twig