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/notifications/containers/notification_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
@@ -11,7 +11,6 @@ const makeMapStateToProps = () => {

  const mapStateToProps = (state, props) => ({
    notification: getNotification(state, props.notification, props.accountId),
-    settings: state.get('local_settings'),
    notifCleaning: state.getIn(['notifications', 'cleaningMode']),
  });