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 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.		1 year ago
..
migrate	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	1 year ago
post_migrate	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	1 year ago
seeds	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
views	Fix some old migration scripts (#17394)	3 years ago
schema.rb	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	1 year ago
seeds.rb	Drop EOL Ruby 2.7 (#24237)	1 year ago