]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Thu, 10 Oct 2013 12:07:13 +0000 (14:07 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Thu, 10 Oct 2013 12:07:13 +0000 (14:07 +0200)

Trivial merge