Merge branch 'cv-rework' into cv-rework-dynflow
Conflicts: app/models/katello/content_view.rb engines/bastion/test/content-views/details/content-view-versions.controller.test.js
Added by Justin Sherrill about 10 years ago
Merge branch 'cv-rework' into cv-rework-dynflow
Conflicts:
app/models/katello/content_view.rb
engines/bastion/test/content-views/details/content-view-versions.controller.test.js