Merge branch 'master' into flag-detail

This commit is contained in:
Riley Davis
2017-04-14 12:56:11 -06:00
46 changed files with 1080 additions and 190 deletions
@@ -10,7 +10,7 @@ const FlagWidget = ({assets}) => {
return (
<div className={styles.widget}>
<h2 className={styles.heading}>Articles with the most flags</h2>
<h2 className={styles.heading}>{lang.t('dashboard.most_flags')}</h2>
<div className={styles.widgetHead}>
<p>{lang.t('streams.article')}</p>
<p>{lang.t('dashboard.flags')}</p>