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 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.		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	5 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	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