Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00
parent 3023725936 88627fd7aa
commit 35fbdc36f9
230 changed files with 8548 additions and 567 deletions
--- a/app/javascript/mastodon/features/mutes/index.js
+++ b/app/javascript/mastodon/features/mutes/index.js
@@ -54,7 +54,7 @@ export default class Mutes extends ImmutablePureComponent {
    }

    return (
-      <Column icon='volume-off' heading={intl.formatMessage(messages.heading)}>
+      <Column name='mutes' icon='volume-off' heading={intl.formatMessage(messages.heading)}>
        <ColumnBackButtonSlim />
        <ScrollContainer scrollKey='mutes'>
          <div className='scrollable mutes' onScroll={this.handleScroll}>