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		2023-03-15 14:13:29 +01:00
..
migrate	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
seeds	Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)	2023-01-18 16:33:03 +01:00
views
schema.rb	Update schema.rb	2022-12-18 04:29:35 +01:00
seeds.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00