Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.
Rename "abandoned" to "moved", and "active" to "primary"
Thibaut Girka
Eugen Rochko