Merge branch 'gs-master' into glitch-theme

2017-12-04 11:07:01 -06:00
parent 1c74ede69e f2f2f10320
commit d9800a5647
214 changed files with 5378 additions and 1033 deletions
--- a/app/javascript/flavours/glitch/features/ui/index.js
+++ b/app/javascript/flavours/glitch/features/ui/index.js
@ -84,6 +84,7 @@ const keyMap = {
  goToProfile: 'g u',
  goToBlocked: 'g b',
  goToMuted: 'g m',
+  toggleSpoiler: 'x',
 };

@connect(mapStateToProps)