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
2018-10-08 13:51:33 +02:00
parent 96c3d26870 4c4ff05a46
commit d17844e6d1
58 changed files with 875 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/locales/en.yml
View File

@ -368,6 +368,9 @@ en:
hero:
desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to instance thumbnail
title: Hero image
mascot:
desc_html: Displayed on multiple pages. At least 293px × 205px recommended. When not set, falls back to instance thumbnail
title: Mascot image
peers_api_enabled:
desc_html: Domain names this instance has encountered in the fediverse
title: Publish list of discovered instances