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 45709d6987 Merge branch 'master' into glitch-soc/master ... Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.		5 years ago
..
_theme.html.haml	Various fixes	7 years ago
admin.html.haml	Merge branch 'master' into glitch-soc/master	5 years ago
application.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
embedded.html.haml	Merge branch 'master' into glitch-soc/master	5 years ago
error.html.haml	Fix static error page to use the correct pack	6 years ago
mailer.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 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	5 years ago