Merge branch 'develop' into feature/hash-routed

2017-03-10 13:27:58 +01:00 · 2017-03-10 13:27:58 +01:00 · 112adcf8f8
commit 112adcf8f8
parent 0eeccb87ce 33f72ab2c2
20 changed files with 91 additions and 71 deletions
--- a/src/main.js
+++ b/src/main.js
@ -31,6 +31,7 @@ Vue.use(VueTimeago, {
 const persistedStateOptions = {
  paths: [
    'config.hideAttachments',
+    'config.hideAttachmentsInConv',
    'config.hideNsfw',
    'statuses.notifications',
    'users.users'