# Conflicts:
#	Gemfile.lock
#	Gemfile.rails5.lock
#	app/views/layouts/devise.html.haml
#	app/views/layouts/devise_empty.html.haml
#	app/views/projects/project_members/index.html.haml
#	spec/requests/api/commits_spec.rb

[ci skip]