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
2020-02-03 09:22:58 +01:00
parent 4cd2d13bd2 3adc722d1c
commit 369201a425
23 changed files with 179 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/simple_form.en.yml
View File

@ -98,7 +98,7 @@ en:
all_day: All-day event
ends_at: End of event
scheduled_at: Schedule publication
starts_at: Begin of event
starts_at: Start of event
text: Announcement
defaults:
autofollow: Invite to follow your account