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
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
flavours	Attempt at fixing inline video player	2018-10-21 16:09:07 +02:00
fonts	…
images	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
packs	Add option to block reports from domain (#8830)	2018-10-20 08:02:44 +02:00
skins	Port Sylvhem's mastodon-light to glitch flavour	2018-05-07 17:00:02 +02:00
styles	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00