diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-26 13:23:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 13:23:52 +0200 |
| commit | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch) | |
| tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/views/layouts/application.html.haml | |
| parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
| parent | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff) | |
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts/application.html.haml')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9ede598b3..21713f72e 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -21,6 +21,9 @@ = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags + - if Setting.custom_css.present? + = stylesheet_link_tag custom_css_path, media: 'all' + = yield :header_tags -# These must come after :header_tags to ensure our initial state has been defined. |