You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
catstodon/db
Jeremy Kescher ddc4022845
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/initial_state.js
#	app/javascript/mastodon/initial_state.js
#	app/lib/feed_manager.rb
#	app/services/batched_remove_status_service.rb
#	lib/mastodon/feeds_cli.rb
1 year ago
..
migrate Merge remote-tracking branch 'upstream/main' into develop 1 year ago
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
seeds Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307) 1 year ago
views Fix some old migration scripts (#17394) 2 years ago
schema.rb Update schema.rb 1 year ago
seeds.rb Add customizable user roles (#18641) 2 years ago