]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of github.com:inthepoche/poche into dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Sat, 17 Aug 2013 19:26:11 +0000 (21:26 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Sat, 17 Aug 2013 19:26:11 +0000 (21:26 +0200)

Trivial merge