diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-07 20:13:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-07 20:13:07 +0200 |
| commit | f1c3053d36bec58e7b258384fd372c1e45252e1d (patch) | |
| tree | 2d72b2608e4bffe1f36039fa81b059ea75c0c656 /app/views | |
| parent | 7cc78431092edb0996372bc93bbc398a34af2395 (diff) | |
| parent | 611740ce81486282dea650e2fbfa50baef58c1b3 (diff) | |
Merge pull request #768 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/home/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/public.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 789de47d1..5f32635e5 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -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') diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index bfa385f58..fd5c67a99 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -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/' |