diff options
author | imncls <himasoto@gmail.com> | 2018-02-23 23:28:31 +0900 |
---|---|---|
committer | imncls <himasoto@gmail.com> | 2018-02-23 23:28:31 +0900 |
commit | bb6988a7ac319c08776d8c07204232a67f992671 (patch) | |
tree | 4a53349374bc4a871a6ce74b786a8e747803155c /app/views/layouts/public.html.haml | |
parent | 544543e40a723d9719f5571bd4c3455a6a69fccd (diff) | |
parent | e668180044560e28bdc5eef94744c210013efcda (diff) |
Merge branch 'master' of https://github.com/tootsuite/mastodon
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb
Diffstat (limited to 'app/views/layouts/public.html.haml')
-rw-r--r-- | app/views/layouts/public.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index b3795eaad..07441a77d 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -1,5 +1,5 @@ - content_for :content do - .container= yield + .container-alt= yield .footer - if !user_signed_in? && single_user_mode? %span.single-user-login |