mastodon/app/views/layouts
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
..
_theme.html.haml
admin.html.haml
application.html.haml Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-11 09:17:21 +00:00
auth.html.haml Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
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 Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
plain_mailer.html.haml
public.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-05-19 22:41:10 +02:00