You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 4dd208f482 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.		6 years ago
..
_theme.html.haml	Various fixes	7 years ago
admin.html.haml	Finalized theme loading and stuff	7 years ago
application.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth.html.haml	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
embedded.html.haml	Fix locale packs loading in embed layout	6 years ago
error.html.haml	Hardcode default skin/theme in error layout (fixes #373)	7 years ago
mailer.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	7 years ago
modal.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	7 years ago
public.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago