Merge remote-tracking branch 'origin/master' into cv-rework
Conflicts: app/lib/actions/katello/environment/library_create.rb app/models/katello/content_view_definition.rb app/models/katello/content_view_version.rb test/actions/headpin/library_create_test.rb
Added by Ivan Necas about 10 years ago
Merge remote-tracking branch 'origin/master' into cv-rework
Conflicts:
app/lib/actions/katello/environment/library_create.rb
app/models/katello/content_view_definition.rb
app/models/katello/content_view_version.rb
test/actions/headpin/library_create_test.rb