Merge branch '3.0-preview' into 3.0-preview-update

# Conflicts:
#	.travis.yml
This commit is contained in:
Abdón Rodríguez Davila 2018-04-27 20:30:08 +02:00
commit d8ec3b8ed4
2 changed files with 4 additions and 10 deletions

View File

@ -1,5 +1,5 @@
language: node_js
node_js: stable
node_js: "9"
dist: trusty
sudo: required
addons:

View File

@ -25,9 +25,7 @@
"html": {
"minify": true
},
"bundle": {
"inlineScripts": false
},
"bundle": true,
"addServiceWorker": true
},
{
@ -45,9 +43,7 @@
"html": {
"minify": true
},
"bundle": {
"inlineScripts": false
},
"bundle": true,
"addServiceWorker": true
},
{
@ -63,9 +59,7 @@
"html": {
"minify": true
},
"bundle": {
"inlineScripts": false
},
"bundle": true,
"addServiceWorker": true
}
],