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 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
This commit is contained in:
Thibaut Girka
2019-09-18 17:25:56 +02:00
parent ab646fac5f d0c2c52783
commit 5cadb47238
180 changed files with 1537 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,6 +144,8 @@ en:
must_be_follower: Block notifications from non-followers
must_be_following: Block notifications from people you don't follow
must_be_following_dm: Block direct messages from people you don't follow
invite:
comment: Comment
invite_request:
text: Why do you want to join?
notification_emails: