Merge branch 'master' into cv-rework
Conflicts: app/controllers/katello/api/v2/changesets_controller.rb app/controllers/katello/api/v2/content_view_definitions_controller.rb app/controllers/katello/api/v2/filter_rules_controller.rb app/controllers/katello/api/v2/filters_controller.rb app/controllers/katello/api/v2/puppet_modules_controller.rb app/models/katello/content_view.rb
Added by Justin Sherrill about 10 years ago
Merge branch 'master' into cv-rework
Conflicts:
app/controllers/katello/api/v2/changesets_controller.rb
app/controllers/katello/api/v2/content_view_definitions_controller.rb
app/controllers/katello/api/v2/filter_rules_controller.rb
app/controllers/katello/api/v2/filters_controller.rb
app/controllers/katello/api/v2/puppet_modules_controller.rb
app/models/katello/content_view.rb