masto-fe/app/views/layouts/auth.html.haml
Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00

13 lines
233 B
Text

- content_for :content do
.container-alt
.logo-container
%h1
= link_to root_path do
= svg_logo_full
.form-container
= render 'flashes'
= yield
= render template: 'layouts/application'