Merge remote-tracking branch 'upstream/master' into fix/issue-110-update-mapbox-style-spec

Conflicts:
	package.json
This commit is contained in:
orangemug
2017-04-13 08:26:25 +01:00
5 changed files with 18 additions and 5 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ module.exports = {
]
},
output: {
path: path.join(__dirname, 'public'),
path: path.join(__dirname, '..', 'public'),
filename: '[name].[chunkhash].js',
chunkFilename: '[chunkhash].js'
},