Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
beatrix-bitrot 2017-06-27 20:46:13 +00:00
commit ddafde942c
91 changed files with 1274 additions and 751 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,6 @@ export default class StatusActionBar extends ImmutablePureComponent {
handleReport = () => {
this.props.onReport(this.props.status);
this.context.router.history.push('/report');
}
handleConversationMuteClick = () => {