]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'skibbipl-dev' into dev
authorNicolas Lœuillet <nicolas@loeuillet.org>
Mon, 21 Jul 2014 19:22:34 +0000 (21:22 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Mon, 21 Jul 2014 19:22:34 +0000 (21:22 +0200)

Trivial merge