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 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.		6 years ago
..
activitypub	Improve support for aspects/circles (#8950)	6 years ago
rest	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
rss	Add RSS feeds for end-users (#7259)	7 years ago
web	Only display web push notifications after API call (fixes #7902) (#8396)	6 years ago
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
manifest_serializer.rb	implement web share target (#6278)	7 years ago
oembed_serializer.rb	Clean up and improve generated OpenGraph tags (#4901)	7 years ago
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	6 years ago