luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-02-08 12:37:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/relationships
History
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
..
_account.html.haml Add relationship manager UI (#10268) 2019-03-16 11:23:22 +01:00
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00