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

2019-05-28 17:45:06 +02:00
parent 1b0ce85e3d b793722d7d
commit 3d73d76e55
21 changed files with 94 additions and 110 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -39,3 +39,6 @@

  %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')