Sean King 9309ef4893 Fix merge conflicts

2021-01-18 20:09:35 -07:00

..

action_bar.js

Fix merge conflicts

2021-01-18 20:09:35 -07:00

card.js

…

detailed_status.js

…

status_interaction_bar.js

…