Merge branch 'master' into next

This commit is contained in:
Wyatt Johnson
2017-12-05 14:02:09 -07:00
20 changed files with 271 additions and 104 deletions
@@ -207,7 +207,7 @@ export default class FlagButton extends Component {
}
{
this.state.reason && <div>
<label htmlFor={'message'} className={`${name}-popup-radio-label`}>
<label htmlFor={'message'} className={`${name}-popup-textarea-label`}>
{t('flag_reason')}
</label><br/>
<textarea