-
Dmitriy Zaporozhets authored
Conflicts: app/controllers/uploads_controller.rb app/helpers/application_helper.rb app/models/note.rb app/services/test_hook_service.rb db/schema.rb spec/models/note_spec.rb
b2d45bb5
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Conflicts: app/controllers/uploads_controller.rb app/helpers/application_helper.rb app/models/note.rb app/services/test_hook_service.rb db/schema.rb spec/models/note_spec.rb