Merge branch 'develop' into feature/hash-routed

2017-02-26 11:39:42 +01:00 · 2017-02-26 11:39:42 +01:00 · 290180a987
commit 290180a987
parent 7661357cf6 bebd5c3328
23 changed files with 389 additions and 202 deletions
--- a/src/main.js
+++ b/src/main.js
@ -29,7 +29,12 @@ Vue.use(VueTimeago, {
 })

 const persistedStateOptions = {
-  paths: ['users.users', 'statuses.notifications']
+  paths: [
+    'config.hideAttachments',
+    'config.hideNsfw',
+    'statuses.notifications',
+    'users.users'
+  ]
 }

 const store = new Vuex.Store({