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
..
exports
migration
preferences
two_factor_authentication
aliases_controller.rb
applications_controller.rb
base_controller.rb
deletes_controller.rb	Remove setting that disables account deletes (#17683)	2022-10-06 10:16:47 +02:00
exports_controller.rb
featured_tags_controller.rb	Change featured hashtag deletion to be done synchronously (#19590)	2022-10-31 16:31:44 +01:00
flavours_controller.rb
imports_controller.rb
login_activities_controller.rb
migrations_controller.rb
pictures_controller.rb
preferences_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
profiles_controller.rb
sessions_controller.rb
two_factor_authentication_methods_controller.rb