You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
_account.html.haml	Add relationship manager UI (#10268)	6 years ago
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago