Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.
This commit is contained in:
8
app/views/layouts/helper_frame.html.haml
Normal file
8
app/views/layouts/helper_frame.html.haml
Normal file
@@ -0,0 +1,8 @@
|
||||
!!! 5
|
||||
%html
|
||||
%head
|
||||
%meta{ charset: 'utf-8' }/
|
||||
|
||||
= javascript_pack_tag 'common', crossorigin: 'anonymous'
|
||||
|
||||
= yield :header_tags
|
Reference in New Issue
Block a user