]> 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>
Fri, 3 Jan 2014 14:18:32 +0000 (15:18 +0100)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Fri, 3 Jan 2014 14:18:32 +0000 (15:18 +0100)

Trivial merge