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`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.
This commit is contained in:
Thibaut Girka
2020-04-12 16:50:27 +02:00
parent 51bbf0b68d 490ff09c5a
commit fdd0beefa7
17 changed files with 247 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@
%h4= t 'footer.developers'
%ul
%li= link_to t('about.documentation'), 'https://docs.joinmastodon.org/'
%li= link_to t('about.api'), 'https://docs.joinmastodon.org/api/guidelines/'
%li= link_to t('about.api'), 'https://docs.joinmastodon.org/client/intro/'
.column-2
%h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'
= link_to svg_logo, root_url, class: 'brand'