diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-19 22:41:10 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-19 22:41:10 +0200 |
| commit | b481e4fac1c564b8008f6f1d0eea1727ec9faa08 (patch) | |
| tree | 6917de2e59e69f5ad0dc9b1471a7c7c8659c1af8 /app/views/layouts/public.html.haml | |
| parent | 625c4f36ef394215e65e19157bfaf60e7de94b5f (diff) | |
| parent | 6aa5ea1b5dff54941682cb006ac2b11ab7b77988 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/simple_form.ja.yml
Diffstat (limited to 'app/views/layouts/public.html.haml')
| -rw-r--r-- | app/views/layouts/public.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 858d354fa..8bbd184bb 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -9,6 +9,6 @@ - else %span.footer__domain= link_to site_hostname, root_path %span.powered-by - != t('generic.powered_by', link: link_to('Mastodon', 'https://joinmastodon.org')) + != t('generic.powered_by', link: link_to('https://joinmastodon.org') { image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' }) = render template: 'layouts/application' |