Merge branch 'develop' into 'notifications'

# Conflicts: # src/main.js
2018-08-24 23:00:56 +00:00 · 2018-08-24 23:00:56 +00:00 · fe906cc3f0
commit fe906cc3f0
parent 13acdc4a00 55650ff7ea
16 changed files with 224 additions and 101 deletions
--- a/src/modules/config.js
+++ b/src/modules/config.js
@ -15,6 +15,7 @@ const defaultState = {
  hoverPreview: true,
  pauseOnUnfocused: true,
  stopGifs: false,
+  replyVisibility: 'all',
  muteWords: [],
  highlight: {}
 }