diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-11 09:17:21 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-11 09:17:21 +0000 |
| commit | a0724cd7426dec36b7966c86a1708f62e6e5fd4c (patch) | |
| tree | 4dda4d9148ceaca5634f7860d3c4c2aa2e6f95e7 /app/views | |
| parent | 0c2a16fcbfeb01df3e37f158937f50f0d1480370 (diff) | |
| parent | b6003afcdb1b89eb967a2b211e3b4e26aed9ac9d (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/views')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 475601fff..9ede598b3 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -11,7 +11,7 @@ %meta{ name: 'theme-color', content: '#282c37' }/ %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/ - %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp, ' - ', title]) : title + %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous' - if @theme |