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:
	README.md

Discarded upstream changes to the README, kept our version.
This commit is contained in:
Thibaut Girka
2018-09-03 14:33:06 +02:00
parent e915bc3e9e ccc2f608c5
commit 6c233a04a0
67 changed files with 1726 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,7 @@ en:
follow_request: Send e-mail when someone requests to follow you
mention: Send e-mail when someone mentions you
reblog: Send e-mail when someone boosts your status
report: Send e-mail when a new report is submitted
'no': 'No'
required:
mark: "*"