]> 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>
Tue, 22 Oct 2013 06:51:30 +0000 (08:51 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Tue, 22 Oct 2013 06:51:30 +0000 (08:51 +0200)

Trivial merge