From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 28 May 2019 15:45:06 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3d73d76e551193a9beffec7a8cdf67e3d18978cf;p=mastodon.git

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

3d73d76e551193a9beffec7a8cdf67e3d18978cf
diff --cc app/views/layouts/application.html.haml
index 34c25a7d1,220a4ca9b..f11fddd4d
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@@ -37,5 -29,10 +37,8 @@@
      - if Setting.custom_css.present?
        = stylesheet_link_tag custom_css_path, media: 'all'
  
 -    = yield :header_tags
 -
    %body{ class: body_classes }
      = content_for?(:content) ? yield(:content) : yield
+ 
+     %div{ style: 'display: none'}
+       = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')