Try to reduce conflicts
Try to reduce conflicts

openwide-java/gitlabhq,iiet/iiet-git,daiyu/gitlab-zh,darkrasid/gitlabhq,jirutka/gitlabhq,mmkassem/gitlabhq,openwide-java/gitlabhq,LUMC/gitlabhq,htve/GitlabForChinese,dplarson/gitlabhq,t-zuehlsdorff/gitlabhq,jirutka/gitlabhq,axilleas/gitlabhq,mmkassem/gitlabhq,htve/GitlabForChinese,t-zuehlsdorff/gitlabhq,LUMC/gitlabhq,daiyu/gitlab-zh,jirutka/gitlabhq,dreampet/gitlab,LUMC/gitlabhq,iiet/iiet-git,dplarson/gitlabhq,openwide-java/gitlabhq,iiet/iiet-git,mmkassem/gitlabhq,dreampet/gitlab,axilleas/gitlabhq,axilleas/gitlabhq,dreampet/gitlab,htve/GitlabForChinese,dreampet/gitlab,jirutka/gitlabhq,axilleas/gitlabhq,t-zuehlsdorff/gitlabhq,mmkassem/gitlabhq,iiet/iiet-git,LUMC/gitlabhq,openwide-java/gitlabhq,darkrasid/gitlabhq,stoplightio/gitlabhq,htve/GitlabForChinese,daiyu/gitlab-zh,t-zuehlsdorff/gitlabhq,dplarson/gitlabhq,daiyu/gitlab-zh,stoplightio/gitlabhq,dplarson/gitlabhq,darkrasid/gitlabhq,stoplightio/gitlabhq,stoplightio/gitlabhq,darkrasid/gitlabhq