Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		2021-04-20 12:17:14 +02:00
..
activitypub	Fix media not being marked sensitive when outgoing CW is set	2020-11-13 01:05:55 +01:00
nodeinfo
rest	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
rss
web	Only display web push notifications after API call (fixes #7902) (#8396)	2018-08-23 21:44:27 +02:00
initial_state_serializer.rb
manifest_serializer.rb	Add app shortcuts (#15234)	2020-12-15 02:04:56 +01:00
oembed_serializer.rb
webfinger_serializer.rb