]> 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, 7 Jan 2014 12:13:30 +0000 (13:13 +0100)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Tue, 7 Jan 2014 12:13:30 +0000 (13:13 +0100)

Trivial merge