Merge tootsuite/master at 3023725936

This commit is contained in:
Surinna Curtis committed 2017-11-16 01:21:16 -06:00
commit 35fbdc36f9
230 files changed
+8548 -567

No files matched your search

@@ -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}>