Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
parent 625c4f36ef 6aa5ea1b5d
commit b481e4fac1
113 changed files with 595 additions and 753 deletions
--- 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'