Skip to content
Find file Blame History Permalink
  • Eike Ziller's avatar
    Merge remote-tracking branch 'origin/3.2' · e7ea94b6
    Eike Ziller authored 
    Conflicts:
	src/plugins/git/gerrit/gerritparameters.cpp
	src/plugins/git/gerrit/gerritplugin.h
	src/plugins/git/gitclient.cpp

Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec
    e7ea94b6