# Conflicts:
#	app/views/admin/users/index.html.haml
#	app/views/projects/mirrors/_mirror_repos.html.haml
#	app/views/projects/project_members/_new_project_member.html.haml

[ci skip]