]> 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, 8 Oct 2013 11:38:03 +0000 (13:38 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Tue, 8 Oct 2013 11:38:03 +0000 (13:38 +0200)

Trivial merge