aboutsummaryrefslogtreecommitdiffhomepage
path: root/webpack.config.js
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2018-11-25 09:58:18 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2018-11-25 09:58:18 +0100
commitb878be4cc99fd4927c70b59386cf7a57b33bb381 (patch)
tree9a5186ead93b9f6114b5341a7713f614eb58f6ec /webpack.config.js
parente673b54f702f274a087e4feff409663d9636e57b (diff)
parentbffe65478de71113a16f6e7a7ef75845c9d61180 (diff)
downloadwallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.gz
wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.zst
wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.zip
Merge remote-tracking branch 'origin/master' into 2.4
# Conflicts: # web/wallassets/baggy.js # web/wallassets/manifest.json # web/wallassets/material.css # web/wallassets/material.js
Diffstat (limited to 'webpack.config.js')
0 files changed, 0 insertions, 0 deletions