# Conflicts:
#	app/assets/javascripts/locale/bg/app.js
#	app/assets/javascripts/locale/de/app.js
#	app/assets/javascripts/locale/en/app.js
#	app/assets/javascripts/locale/fr/app.js
#	app/assets/javascripts/locale/pt_BR/app.js
#	app/assets/javascripts/locale/zh_HK/app.js
#	app/assets/javascripts/locale/zh_TW/app.js
#	doc/README.md
#	lib/gitlab/ldap/access.rb
#	spec/lib/gitlab/ldap/access_spec.rb
#	spec/models/project_spec.rb
[ci skip]