Fix conflicts in prep branches
I need help fixing these conflicts when merging ce to ee in the prep branches:
-
@reprazent app/views/devise/shared/_signup_box.html.haml
-
@jramsay doc/user/project/issue_board.md
-
@DouweM lib/api/users.rb
-
@reprazent locale/gitlab.pot
Thanks!
Edited by Filipa Lacerda