diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 18:06:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 18:06:31 +0000 |
| commit | d08bdd4ef323dcd3f9d66ee44e79e925dc1a5254 (patch) | |
| tree | 08b8fd0c08766a7005136026682e862b8de98771 | |
| parent | 468a11fcbeb88811a8224539e988b9aab3bb7a01 (diff) | |
| download | gitlab-ce-d08bdd4ef323dcd3f9d66ee44e79e925dc1a5254.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-6-stable-ee
| -rw-r--r-- | CHANGELOG-EE.md | 4 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
4 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index eb742864b24..a947f756cb1 100644 --- a/CHANGELOG-EE.md +++ b/CHANGELOG-EE.md @@ -1,5 +1,9 @@ Please view this file on the master branch, on stable branches it's out of date. +## 12.6.6 + +- No changes. + ## 12.6.5 - No changes. @@ -1 +1 @@ -12.6.6 +12.6.6-ee diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100755..100644 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |