diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-23 05:40:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-23 05:40:28 +0200 |
| commit | 66126f302167d21e4bf247e660f595ff0beaaf20 (patch) | |
| tree | c63eb3ba86ec37d2a0a7fd0f39e62a1c86f785d3 /app/javascript/mastodon/features/compose/components/compose_form.js | |
| parent | 293972f716476933df2b665ad755cafe4d29d82d (diff) | |
Add custom emojis to the emoji picker (#5052)
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/compose_form.js')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index bb747b611..d31041061 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -12,7 +12,7 @@ import Collapsable from '../../../components/collapsable'; import SpoilerButtonContainer from '../containers/spoiler_button_container'; import PrivacyDropdownContainer from '../containers/privacy_dropdown_container'; import SensitiveButtonContainer from '../containers/sensitive_button_container'; -import EmojiPickerDropdown from './emoji_picker_dropdown'; +import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container'; import UploadFormContainer from '../containers/upload_form_container'; import WarningContainer from '../containers/warning_container'; import { isMobile } from '../../../is_mobile'; |