Merge branch 'master' into asset-name-fixes

This commit is contained in:
Wyatt Johnson
2017-03-01 16:43:25 -07:00
committed by GitHub
@@ -79,16 +79,12 @@ class Configure extends Component {
break;
case 'moderation':
sectionComponent = <ModerationSettings
title={pageTitle}
onChangeWordlist={this.onChangeWordlist}
fetchingSettings={this.props.settings.fetchingSettings}
settings={this.props.settings}
updateSettings={this.onSettingUpdate} />;
break;
case 'tech':
sectionComponent = <TechSettings
title={pageTitle}
fetchingSettings={this.props.settings.fetchingSettings}
onChangeDomainlist={this.onChangeDomainlist}
settings={this.props.settings}
updateSettings={this.onSettingUpdate} />;