CE Upstream - Friday
Resolved conflicts:
UU spec/controllers/admin/application_settings_controller_spec.rb
UU spec/serializers/environment_entity_spec.rb
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Resolved conflicts:
UU spec/controllers/admin/application_settings_controller_spec.rb
UU spec/serializers/environment_entity_spec.rb