fixing conflict.
fixing conflict.

SVArago/gitlabhq,daiyu/gitlab-zh,jirutka/gitlabhq,mmkassem/gitlabhq,mr-dxdy/gitlabhq,SVArago/gitlabhq,dreampet/gitlab,dplarson/gitlabhq,yatish27/gitlabhq,Soullivaneuh/gitlabhq,shinexiao/gitlabhq,icedwater/gitlabhq,Soullivaneuh/gitlabhq,larryli/gitlabhq,t-zuehlsdorff/gitlabhq,jrjang/gitlabhq,jirutka/gitlabhq,darkrasid/gitlabhq,openwide-java/gitlabhq,shinexiao/gitlabhq,axilleas/gitlabhq,htve/GitlabForChinese,duduribeiro/gitlabhq,LUMC/gitlabhq,screenpages/gitlabhq,jrjang/gitlabhq,larryli/gitlabhq,martijnvermaat/gitlabhq,jrjang/gitlab-ce,jrjang/gitlabhq,dplarson/gitlabhq,dplarson/gitlabhq,Datacom/gitlabhq,shinexiao/gitlabhq,jirutka/gitlabhq,icedwater/gitlabhq,mmkassem/gitlabhq,dwrensha/gitlabhq,duduribeiro/gitlabhq,jrjang/gitlab-ce,stoplightio/gitlabhq,darkrasid/gitlabhq,allysonbarros/gitlabhq,koreamic/gitlabhq,ttasanen/gitlabhq,Soullivaneuh/gitlabhq,t-zuehlsdorff/gitlabhq,SVArago/gitlabhq,Soullivaneuh/gitlabhq,LUMC/gitlabhq,jirutka/gitlabhq,jrjang/gitlab-ce,dreampet/gitlab,dwrensha/gitlabhq,Datacom/gitlabhq,htve/GitlabForChinese,iiet/iiet-git,axilleas/gitlabhq,screenpages/gitlabhq,LUMC/gitlabhq,openwide-java/gitlabhq,yatish27/gitlabhq,daiyu/gitlab-zh,icedwater/gitlabhq,allysonbarros/gitlabhq,LUMC/gitlabhq,koreamic/gitlabhq,mmkassem/gitlabhq,martijnvermaat/gitlabhq,martijnvermaat/gitlabhq,dreampet/gitlab,yatish27/gitlabhq,openwide-java/gitlabhq,mrb/gitlabhq,mr-dxdy/gitlabhq,duduribeiro/gitlabhq,allysonbarros/gitlabhq,dreampet/gitlab,mrb/gitlabhq,ttasanen/gitlabhq,mrb/gitlabhq,ttasanen/gitlabhq,stoplightio/gitlabhq,daiyu/gitlab-zh,darkrasid/gitlabhq,openwide-java/gitlabhq,iiet/iiet-git,dplarson/gitlabhq,t-zuehlsdorff/gitlabhq,axilleas/gitlabhq,koreamic/gitlabhq,larryli/gitlabhq,dwrensha/gitlabhq,martijnvermaat/gitlabhq,Datacom/gitlabhq,htve/GitlabForChinese,darkrasid/gitlabhq,larryli/gitlabhq,Datacom/gitlabhq,duduribeiro/gitlabhq,koreamic/gitlabhq,yatish27/gitlabhq,shinexiao/gitlabhq,mrb/gitlabhq,t-zuehlsdorff/gitlabhq,iiet/iiet-git,dwrensha/gitlabhq,ttasanen/gitlabhq,daiyu/gitlab-zh,mmkassem/gitlabhq,icedwater/gitlabhq,iiet/iiet-git,mr-dxdy/gitlabhq,stoplightio/gitlabhq,axilleas/gitlabhq,mr-dxdy/gitlabhq,allysonbarros/gitlabhq,jrjang/gitlab-ce,screenpages/gitlabhq,jrjang/gitlabhq,htve/GitlabForChinese,screenpages/gitlabhq,SVArago/gitlabhq,stoplightio/gitlabhq