Merge strategy#1142

Merged

gitblit merged 2 commits intogitblit-org:masterfrom

flaix:merge-strategy

Oct 28, 2016

Commits on Oct 28, 2016

Add integration strategy to merge tickes fast-forward or with commit.

flaix
authored and
fzs
committed
Add merge type setting to repository page.

flaix
authored and
fzs
committed