Merge branch 'master' into admin-improvements

This commit is contained in:
Kiwi
2018-10-26 20:08:24 +02:00
committed by GitHub
13 changed files with 38 additions and 28 deletions
@@ -155,9 +155,19 @@ class StreamSettings extends React.Component {
<ConfigureCard
checked={settings.infoBoxEnable}
onCheckbox={this.updateInfoBoxEnable}
title={t('configure.include_comment_stream')}
title={t('configure.code_of_conduct_summary')}
>
<p>{t('configure.include_comment_stream_desc')}</p>
<p>
{t('configure.code_of_conduct_summary_desc')}
&nbsp;
<a
target="_blank"
rel="noopener noreferrer"
href="https://guides.coralproject.net/create-a-code-of-conduct/"
>
Code of Conduct Guide.
</a>
</p>
<div
className={cn(
styles.configSettingInfoBox,