]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'tcitworld-ebook' into dev
authorThomas Citharel <tcit@tcit.fr>
Sat, 13 Dec 2014 23:16:39 +0000 (00:16 +0100)
committerThomas Citharel <tcit@tcit.fr>
Sat, 13 Dec 2014 23:16:39 +0000 (00:16 +0100)

Trivial merge