]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge branch 'epub' into dev
authortcit <tcit@tcit.fr>
Fri, 16 May 2014 14:31:18 +0000 (16:31 +0200)
committertcit <tcit@tcit.fr>
Fri, 16 May 2014 14:31:18 +0000 (16:31 +0200)
commit404adf970d985da0f624c42a5aa5e9c63694b08d
treeab298f6d6687dcef7494d7bd938dcdaac80a48fc
parent74e09e562ba46c52da364539aa4fc0414114ca87
parentf3f0b11393dd7f11bc1e63df9488c3930c0bc06f
Merge branch 'epub' into dev

Conflicts:
themes/baggy/home.twig
inc/poche/Poche.class.php
themes/baggy/home.twig