]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' 1.8.0
authorNicolas Lœuillet <nicolas.loeuillet@smile.fr>
Fri, 10 Oct 2014 11:33:54 +0000 (13:33 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@smile.fr>
Fri, 10 Oct 2014 11:33:54 +0000 (13:33 +0200)

Trivial merge