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

Merge tag 'v3.0.0' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2019-10-04 19:49:43 +02:00
parent 360234d1bf 83d3e7733d
commit 1bbba0016a
31 changed files with 419 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/en.yml
View File

@ -809,7 +809,7 @@ en:
'604800': 1 week
'86400': 1 day
expires_in_prompt: Never
generate: Generate
generate: Generate invite link
invited_by: 'You were invited by:'
max_uses:
one: 1 use