kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix a conflict in GITALY_SERVER_VERSION 

GitLab.com master now points at Gitaly v1.17.0. Dev master pointed at
1.14.1 due to a recent security release. That fix is present in 1.17.0
so it is safe to take the .com side here.
This commit is contained in:
Nick Thomas 2019-02-05 14:34:35 +00:00
parent 32af0108cf
commit d18cd4ad08
No known key found for this signature in database
GPG Key ID: 2A313A47AFADACE9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GITALY_SERVER_VERSION
View File

@ -1,5 +1 @@
<<<<<<< HEAD
1.17.0
=======
1.14.1
>>>>>>> dev/master