summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-13 17:19:55 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-13 17:19:55 +0000
commit683d452556a21caf649ef8bf70d22033b4f3b934 (patch)
treeb1148df7113852f9aee552066332744cc277b7f4
parent307aa730b120b00456b330195af11a7af25bba19 (diff)
downloadgitlab-ce-683d452556a21caf649ef8bf70d22033b4f3b934.tar.gz
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
-rwxr-xr-x[-rw-r--r--]vendor/gitignore/C++.gitignore0
-rwxr-xr-x[-rw-r--r--]vendor/gitignore/Java.gitignore0
2 files changed, 0 insertions, 0 deletions
diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore
index 259148fa18f..259148fa18f 100644..100755
--- 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 100644..100755
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore