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-07 19:47:56 +02:00
parent 7cc7843109 25744d43b0
commit 611740ce81
50 changed files with 1503 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/home/index.html.haml
View File

@ -12,4 +12,4 @@
= image_tag asset_pack_path('logo.svg'), alt: 'Mastodon'
%div
= t('errors.noscript_html')
= t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')

4
app/views/layouts/public.html.haml
View File

@ -26,8 +26,8 @@
.column-1
%h4= t 'footer.developers'
%ul
%li= link_to t('about.documentation'), 'https://github.com/tootsuite/documentation'
%li= link_to t('about.api'), 'https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md'
%li= link_to t('about.documentation'), 'https://docs.joinmastodon.org/'
%li= link_to t('about.api'), 'https://docs.joinmastodon.org/api/guidelines/'
.column-2
%h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'