Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.		2018-10-22 17:51:38 +02:00
..
bug_report.md	Adapt github issue template to glitch-soc	2018-08-19 16:56:42 +02:00
feature_request.md	Fix feature request issue template	2018-10-16 03:02:01 +02:00
support.md	Update issue templates (#8989)	2018-10-16 03:01:07 +02:00