4 Commits (5ca976c776a0d7c60cf48126075510b57cadc635)

Author	SHA1	Message	Date
Thibaut Girka	365de06816	Merge branch 'master' into glitch-soc/merge-upstream ... 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.	6 years ago
Eugen Rochko	b1e0164848	Add dormant filter to relationship manager, rename other filters (#10308) ... Rename "abandoned" to "moved", and "active" to "primary"	6 years ago
Thibaut Girka	847374e78d	Fix relationships controller/view wrt. glitch-soc theming engine	6 years ago
Eugen Rochko	4fa2d55d4e	Add relationship manager UI (#10268)	6 years ago