Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

Browse source 
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
This commit is contained in:
David Yip 2017-09-09 23:56:21 -05:00
commit 67ad453373
67 changed files with 698 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -137,7 +137,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
menu.push(null);
if (withDismiss) {
if (status.getIn(['account', 'id']) === me || withDismiss) {
menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
menu.push(null);
}