Merge branch 'master' into i18n-refactor

This commit is contained in:
gaba
2017-05-01 11:28:06 -07:00
101 changed files with 2961 additions and 2106 deletions
@@ -28,6 +28,8 @@ const shortcuts = [
export default class ModerationKeysModal extends React.Component {
static propTypes = {
open: PropTypes.bool.isRequired,
onClose: PropTypes.func.isRequired,
hideShortcutsNote: PropTypes.func.isRequired,
shortcutsNoteVisible: PropTypes.string.isRequired
}