]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge remote-tracking branch 'origin/master' into 2.1
authorJeremy Benoist <jeremy.benoist@gmail.com>
Fri, 30 Sep 2016 11:27:19 +0000 (13:27 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Fri, 30 Sep 2016 11:27:19 +0000 (13:27 +0200)

Trivial merge