Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.		2022-02-17 10:58:44 +01:00
..
challenges_controller.rb
confirmations_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb
registrations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +01:00
sessions_controller.rb
setup_controller.rb