Merge branch 'develop' into feature/hash-routed

This commit is contained in:
Roger Braun 2017-02-21 11:48:55 +01:00
commit 7661357cf6
2 changed files with 2 additions and 3 deletions

View file

@ -23,7 +23,7 @@ module.exports = {
extensions: ['', '.js', '.vue'],
fallback: [path.join(__dirname, '../node_modules')],
alias: {
'vue$': 'vue/dist/vue.common',
'vue$': 'vue/dist/vue.runtime.common',
'src': path.resolve(__dirname, '../src'),
'assets': path.resolve(__dirname, '../src/assets'),
'components': path.resolve(__dirname, '../src/components')

View file

@ -66,8 +66,7 @@ new Vue({
router,
store,
el: '#app',
template: '<App/>',
components: { App }
render: h => h(App)
})
window.fetch('/static/config.json')