resolve changelog conflict
resolve changelog conflict

dreampet/gitlab,icedwater/gitlabhq,jirutka/gitlabhq,iiet/iiet-git,htve/GitlabForChinese,daiyu/gitlab-zh,iiet/iiet-git,darkrasid/gitlabhq,axilleas/gitlabhq,shinexiao/gitlabhq,screenpages/gitlabhq,LUMC/gitlabhq,LUMC/gitlabhq,mr-dxdy/gitlabhq,htve/GitlabForChinese,iiet/iiet-git,darkrasid/gitlabhq,martijnvermaat/gitlabhq,SVArago/gitlabhq,daiyu/gitlab-zh,icedwater/gitlabhq,allysonbarros/gitlabhq,shinexiao/gitlabhq,jirutka/gitlabhq,martijnvermaat/gitlabhq,dreampet/gitlab,stoplightio/gitlabhq,t-zuehlsdorff/gitlabhq,stoplightio/gitlabhq,axilleas/gitlabhq,daiyu/gitlab-zh,dreampet/gitlab,mmkassem/gitlabhq,openwide-java/gitlabhq,SVArago/gitlabhq,jirutka/gitlabhq,darkrasid/gitlabhq,t-zuehlsdorff/gitlabhq,LUMC/gitlabhq,mr-dxdy/gitlabhq,mmkassem/gitlabhq,dplarson/gitlabhq,openwide-java/gitlabhq,openwide-java/gitlabhq,dplarson/gitlabhq,axilleas/gitlabhq,dplarson/gitlabhq,screenpages/gitlabhq,allysonbarros/gitlabhq,SVArago/gitlabhq,icedwater/gitlabhq,screenpages/gitlabhq,htve/GitlabForChinese,axilleas/gitlabhq,stoplightio/gitlabhq,shinexiao/gitlabhq,allysonbarros/gitlabhq,iiet/iiet-git,jirutka/gitlabhq,mmkassem/gitlabhq,dreampet/gitlab,mr-dxdy/gitlabhq,daiyu/gitlab-zh,dplarson/gitlabhq,shinexiao/gitlabhq,darkrasid/gitlabhq,t-zuehlsdorff/gitlabhq,SVArago/gitlabhq,martijnvermaat/gitlabhq,mmkassem/gitlabhq,openwide-java/gitlabhq,htve/GitlabForChinese,LUMC/gitlabhq,icedwater/gitlabhq,allysonbarros/gitlabhq,stoplightio/gitlabhq,screenpages/gitlabhq,t-zuehlsdorff/gitlabhq,mr-dxdy/gitlabhq,martijnvermaat/gitlabhq