]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge remote-tracking branch 'origin/master' into 2.4
authorJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 25 Nov 2018 08:58:18 +0000 (09:58 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 25 Nov 2018 08:58:18 +0000 (09:58 +0100)
# Conflicts:
# web/wallassets/baggy.js
# web/wallassets/manifest.json
# web/wallassets/material.css
# web/wallassets/material.js


No differences found