mastodon/app/views/layouts
David Yip f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml
2018-01-28 22:45:17 -06:00
..
_theme.html.haml
admin.html.haml
application.html.haml
auth.html.haml
embedded.html.haml
error.html.haml
mailer.html.haml Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-28 22:45:17 -06:00
mailer.text.erb
modal.html.haml
plain_mailer.html.haml
public.html.haml