]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'master' into 2.3
authorNicolas Lœuillet <nicolas@loeuillet.org>
Thu, 13 Apr 2017 11:07:06 +0000 (13:07 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Thu, 13 Apr 2017 11:07:06 +0000 (13:07 +0200)

Trivial merge