David Yip 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss		2018-01-19 15:22:10 -06:00
..
_theme.html.haml	Various fixes	2017-12-04 21:58:10 -08:00
admin.html.haml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
application.html.haml	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-03 04:17:11 +00:00
auth.html.haml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
embedded.html.haml	Minor fixes	2017-11-21 18:17:38 -08:00
error.html.haml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
mailer.html.haml	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-17 16:17:10 +00:00
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	2018-01-18 19:17:25 +01:00
modal.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-02 00:11:41 -06:00
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
public.html.haml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00