# Conflicts:
#	app/assets/javascripts/pages/search/init_filtered_search.js
#	app/views/projects/issues/index.html.haml
#	app/views/projects/merge_requests/show.html.haml
#	config/webpack.config.js
#	doc/user/project/integrations/prometheus_library/kubernetes.md

[ci skip]