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 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		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 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/merge-upstream	6 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	6 years ago