Merge branch 'kb_migration' into kb_migration_development
This commit is contained in:
commit
cf1ff2c667
153 changed files with 426 additions and 366 deletions
|
@ -2,7 +2,7 @@ import React from 'react';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
import PropTypes from 'prop-types';
|
||||
import IconButton from './icon_button';
|
||||
import { IconButton } from './icon_button';
|
||||
import DropdownMenuContainer from '../containers/dropdown_menu_container';
|
||||
import EmojiPickerDropdown from '../features/compose/containers/emoji_picker_dropdown_container';
|
||||
import { defineMessages, injectIntl } from 'react-intl';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue