Merge branch 'master' into flag-detail

This commit is contained in:
Riley Davis
2017-04-19 11:21:55 -06:00
committed by GitHub
34 changed files with 374 additions and 86 deletions
@@ -116,7 +116,7 @@ class ModerationContainer extends Component {
let asset;
if (data.loading) {
if (!('premodCount' in data)) {
return <div><Spinner/></div>;
}