mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-17 08:50:54 -04:00
Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb db/schema.rb
Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb db/schema.rb