mastodon/app/views/layouts
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
2019-03-13 15:16:02 +01:00
..
_theme.html.haml
admin.html.haml
application.html.haml
auth.html.haml
embedded.html.haml
error.html.haml
mailer.html.haml
mailer.text.erb
modal.html.haml
plain_mailer.html.haml
public.html.haml