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-10-11 22:41:21 +02:00
parent c2112c7781 c4118ba71b
commit 10f1478498
134 changed files with 1669 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/en.yml
View File

@ -1024,7 +1024,7 @@ en:
relationships: Follows and followers
two_factor_authentication: Two-factor Auth
spam_check:
spam_detected_and_silenced: This is an automated report. Spam has been detected and the sender has been silenced automatically. If this is a mistake, please unsilence the account.
spam_detected: This is an automated report. Spam has been detected.
statuses:
attached:
description: 'Attached: %{attached}'