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 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		5 years ago
..
_theme.html.haml	Various fixes	7 years ago
admin.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
application.html.haml	Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream	6 years ago
auth.html.haml	Merge branch 'master' of https://github.com/tootsuite/mastodon	6 years ago
embedded.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
error.html.haml	Fix static error page to use the correct pack	5 years ago
mailer.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	6 years ago
modal.html.haml	Revert Font Awesome 5 upgrade (#8810)	6 years ago
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	6 years ago
public.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago