Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge commit 'b9f59ebcc6' into merging-upstream

Browse source
This commit is contained in:
Ondřej Hruška 2017-09-28 09:18:35 +02:00
commit 83bda6c1a8
No known key found for this signature in database
GPG key ID: 2C5FD5035250423D
4750 changed files with 5257 additions and 3475 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/components/status_action_bar.js
View file

@ -49,7 +49,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
onEmbed: PropTypes.func,
onMuteConversation: PropTypes.func,
onPin: PropTypes.func,
me: PropTypes.number,
me: PropTypes.string,
withDismiss: PropTypes.bool,
intl: PropTypes.object.isRequired,
};