# Conflicts:
#	config/webpack.config.js
#	db/schema.rb
#	locale/gitlab.pot

[ci skip]