gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge commit '34225d7199' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-27 14:06:56 +09:00
commit 76340285d6
168 changed files with 965 additions and 611 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
View file

@ -144,8 +144,7 @@ class ModifierPicker extends React.PureComponent {
}
@injectIntl
class EmojiPickerMenu extends React.PureComponent {
class EmojiPickerMenuImpl extends React.PureComponent {
static propTypes = {
custom_emojis: ImmutablePropTypes.list,
@ -305,7 +304,8 @@ class EmojiPickerMenu extends React.PureComponent {
}
export default @injectIntl
const EmojiPickerMenu = injectIntl(EmojiPickerMenuImpl);
class EmojiPickerDropdown extends React.PureComponent {
static propTypes = {
@ -428,3 +428,5 @@ class EmojiPickerDropdown extends React.PureComponent {
}
}
export default injectIntl(EmojiPickerDropdown);