tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2019-02-12 20:32:48 +01:00
parent a3ba28eb17 2f80a348c9
commit 0e34e91661
101 changed files with 2587 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/mastodon/locales/defaultMessages.json
View File

@@ -319,6 +319,10 @@
{
"defaultMessage": "Open this status in the moderation interface",
"id": "status.admin_status"
},
{
"defaultMessage": "Copy link to status",
"id": "status.copy"
}
],
"path": "app/javascript/mastodon/components/status_action_bar.json"
@@ -1955,6 +1959,10 @@
{
"defaultMessage": "Open this status in the moderation interface",
"id": "status.admin_status"
},
{
"defaultMessage": "Copy link to status",
"id": "status.copy"
}
],
"path": "app/javascript/mastodon/features/status/components/action_bar.json"
@@ -2307,4 +2315,4 @@
],
"path": "app/javascript/mastodon/features/video/index.json"
}
]
]