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

2021-04-05 14:31:07 +02:00
parent 39b9a0619a 117f6638d0
commit c901ae77d4
21 changed files with 191 additions and 47 deletions
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -25,4 +25,4 @@
    = yield

    .logo-resources
-      = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
+      = raw render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')