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

diff --cc Gemfile.lock
Simple merge

diff --cc app/helpers/stream_entries_helper.rb
Simple merge

diff --cc app/views/layouts/application.html.haml
index 34c25a7d1a3598acf10292d9dea15581aae2a4a0,220a4ca9bd287026e2fe71cd354adaaf0de03989..f11fddd4d9637a4b17789dff3f28ddf0005b35c0
--- 1/app/views/layouts/application.html.haml
--- 2/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')

diff --cc app/views/layouts/public.html.haml
Simple merge