GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 79e40c66 authored by John Jarvis's avatar John Jarvis

Merge branch 'sh-gitaly-update-for-11-10' into '11-10-stable-patch-6'

[11.10] Use 3-way merge for squashing commits

See merge request gitlab-org/gitlab-ce!28078
parents cf8df783 3fdcb7d8
title: Use 3-way merge for squashing commits
merge_request: 28078
type: fixed
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment