Merge remote-tracking branch 'origin/cv-rework' into cv-rework-dynflow-publish
Conflicts: app/controllers/katello/api/v2/content_views_controller.rb engines/bastion/app/assets/javascripts/bastion/content-views/details/content-view-publish.controller.js
Added by Ivan Necas about 10 years ago
Merge remote-tracking branch 'origin/cv-rework' into cv-rework-dynflow-publish
Conflicts:
app/controllers/katello/api/v2/content_views_controller.rb
engines/bastion/app/assets/javascripts/bastion/content-views/details/content-view-publish.controller.js