Thibaut Girka dcded13a99 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
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
accounts	Add description meta tag additionally to og:description (#8941)	2018-10-10 02:21:30 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
admin_mailer
application
auth	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
authorize_interactions	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
errors
filters	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
follower_accounts
following_accounts
home	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-07 19:47:56 +02:00
invites	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
kaminari
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
media
notification_mailer
oauth
remote_follow
remote_interaction	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
remote_unfollows
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
shared	Add description meta tag additionally to og:description (#8941)	2018-10-10 02:21:30 +02:00
shares
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
tags
user_mailer
well_known	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00