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 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		6 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	7 years ago
embedded.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	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	Revert Font Awesome 5 upgrade (#8810)	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