aboutsummaryrefslogtreecommitdiff
path: root/src/modules/config.js
diff options
context:
space:
mode:
authorShpuld Shpuldson <shpuld@gmail.com>2017-06-15 23:25:19 +0300
committerShpuld Shpuldson <shpuld@gmail.com>2017-06-15 23:25:19 +0300
commite0e8965c08c09fee16d17e312c3788e13cdd1c88 (patch)
tree53e6c4eebd4328f868c2d3f6eb0b26b3c3e1951d /src/modules/config.js
parent44923afbee23ef7bd22c20d25bf7776b284f5f88 (diff)
parent7d46e3965d06e039537066eeb5fac99ebcab978d (diff)
update branch and fix merge conflicts
Diffstat (limited to 'src/modules/config.js')
-rw-r--r--src/modules/config.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/config.js b/src/modules/config.js
index 05b4ab3b..f7d6e9c8 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -6,7 +6,10 @@ const defaultState = {
colors: {},
hideAttachments: false,
hideAttachmentsInConv: false,
- hideNsfw: true
+ hideNsfw: true,
+ autoLoad: true,
+ hoverPreview: true,
+ muteWords: []
}
const config = {