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:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
This commit is contained in:
Thibaut Girka
2018-05-16 21:52:38 +02:00
parent 80aad16e10 6bed372ad2
commit 78ac246b87
62 changed files with 672 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ en:
hints:
defaults:
avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px
bot: Warns people that the account does not represent a person
bot: This account mainly performs automated actions and might not be monitored
digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
display_name:
one: <span class="name-counter">1</span> character left