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

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	README.md
This commit is contained in:
David Yip
2018-03-12 17:52:19 -05:00
parent 22f2750578 051b649628
commit f8e934f955
59 changed files with 330 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/mastodon/locales/en.json
+2
View File
@@ -259,7 +259,9 @@
"status.sensitive_warning": "Sensitive content",
"status.share": "Share",
"status.show_less": "Show less",
"status.show_less_all": "Show less for all",
"status.show_more": "Show more",
"status.show_more_all": "Show more for all",
"status.unmute_conversation": "Unmute conversation",
"status.unpin": "Unpin from profile",
"tabs_bar.federated_timeline": "Federated",