mastodon/app/views/layouts
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.
2018-08-24 15:10:34 +02:00
..
_theme.html.haml
admin.html.haml
application.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
auth.html.haml
embedded.html.haml Fix locale packs loading in embed layout 2018-08-22 20:39:33 +02:00
error.html.haml Hardcode default skin/theme in error layout (fixes #373) 2018-05-31 14:38:48 +02:00
mailer.html.haml
mailer.text.erb
modal.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
plain_mailer.html.haml
public.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00