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 085a1197da Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components.		1 year ago
..
migrate	Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream	1 year ago
post_migrate	Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream	2 years ago
seeds	Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)	2 years ago
views	Fix some old migration scripts (#17394)	3 years ago
schema.rb	Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream	1 year ago
seeds.rb	Drop EOL Ruby 2.7 (#24237)	2 years ago