Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 19:35:59 +01:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
disputes	…
filters	Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)	2022-08-31 11:55:27 +02:00
oauth	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
well_known	…
about_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
application_controller.rb	…
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
following_accounts_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
health_controller.rb	…
home_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
instance_actors_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	…
privacy_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
relationships_controller.rb	…
shares_controller.rb	…
statuses_cleanup_controller.rb	…
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
tags_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00