2
0
mirror of https://github.com/tenrok/vue-select.git synced 2026-06-19 09:50:33 +03:00

Merge branch 'master' into umd

# Conflicts:
#	src/components/Select.vue
This commit is contained in:
Jeff Sagal
2016-06-15 21:33:16 -07:00
39 changed files with 1515 additions and 914 deletions
+2 -2
View File
@@ -6,8 +6,8 @@ module.exports = {
env: require('./prod.env'),
index: path.resolve(__dirname, '../dist/index.html'),
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
assetsPublicPath: '/',
assetsSubDirectory: '',
assetsPublicPath: ( process.argv.indexOf('publish') > 1 ) ? 'http://sagalbot.github.io/vue-select/' : '/',
productionSourceMap: true
},
dev: {