# Conflicts:
#	app/assets/javascripts/api.js
#	app/views/admin/dashboard/index.html.haml
#	locale/gitlab.pot
#	spec/javascripts/api_spec.js

[ci skip]