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 1c25f35ddf Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.		1 year ago
..
migrate	Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' 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 '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream	1 year ago
seeds.rb	Drop EOL Ruby 2.7 (#24237)	2 years ago