4 Commits

Author	SHA1	Message	Date
Thibaut Girka	291012ec0c	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.	2019-03-18 18:03:27 +01:00
Eugen Rochko	b8e4c85e69	Add dormant filter to relationship manager, rename other filters (#10308) ... Rename "abandoned" to "moved", and "active" to "primary"	2019-03-18 03:53:17 +01:00
Thibaut Girka	8e5d72dba8	Fix relationships controller/view wrt. glitch-soc theming engine	2019-03-16 14:26:14 +01:00
Eugen Rochko	1c113fd72d	Add relationship manager UI (#10268)	2019-03-16 11:23:22 +01:00