# Conflicts:
#	app/serializers/environment_entity.rb
#	locale/gitlab.pot
#	spec/javascripts/environments/mock_data.js

[ci skip]