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.

Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2 years ago
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
views	Fix some old migration scripts (#17394)	3 years ago
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
seeds.rb	Change unconfirmed user login behaviour (#11375)	5 years ago