Merge branch 'master' into bugfix-ban-dialog-language

This commit is contained in:
gaba
2017-03-20 07:32:06 -07:00
2 changed files with 11 additions and 2 deletions
@@ -140,9 +140,11 @@ class ModerationContainer extends Component {
<BanUserDialog
open={moderation.banDialog}
user={moderation.user}
commentId={moderation.commentId}
handleClose={props.hideBanUserDialog}
handleBanUser={props.banUser}
showRejectedNote={moderation.showRejectedNote}
rejectComment={props.rejectComment}
/>
<ModerationKeysModal
open={moderation.modalOpen}