Merge branch 'develop' into feature/hash-routed

This commit is contained in:
Roger Braun 2017-02-20 18:58:18 +01:00
commit 5d8b2eb8b5
29 changed files with 1706 additions and 1531 deletions

View file

@ -17,7 +17,7 @@ import configModule from './modules/config.js'
import VueTimeago from 'vue-timeago'
import createPersistedState from 'vuex-persistedstate'
import createPersistedState from './lib/persisted_state.js'
Vue.use(Vuex)
Vue.use(VueRouter)
@ -29,7 +29,7 @@ Vue.use(VueTimeago, {
})
const persistedStateOptions = {
paths: ['users.users']
paths: ['users.users', 'statuses.notifications']
}
const store = new Vuex.Store({