GitLab

# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/mailers/emails/merge_requests.rb
#	app/services/notification_service.rb
#	spec/javascripts/lib/utils/text_utility_spec.js
#	spec/mailers/notify_spec.rb
#	yarn.lock

[ci skip]