Thibaut Girka 88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream

2018-08-19 09:27:18 +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

Hardcode default skin/theme in error layout (fixes #373)

2018-05-31 14:38:48 +02:00

mailer.html.haml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-28 22:45:17 -06:00

mailer.text.erb

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

modal.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-18 18:04:49 +02:00

plain_mailer.html.haml

HTML e-mails for UserMailer (#6256)

2018-01-16 03:29:11 +01:00

public.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-19 09:27:18 +02:00