Merge branch 'master' into i18n-refactor

This commit is contained in:
gaba
2017-05-15 14:02:34 -07:00
251 changed files with 4984 additions and 1874 deletions
@@ -5,7 +5,7 @@ import I18n from 'coral-i18n/modules/i18n/i18n';
const lang = new I18n();
const ModerationLink = props => props.isAdmin ? (
const ModerationLink = (props) => props.isAdmin ? (
<div className={styles.moderationLink}>
<a href={`/admin/moderate/${props.assetId}`} target="_blank">
{lang.t('moderate_this_stream')}