summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-20 19:14:15 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-20 19:14:15 +0000
commit4683475118d14884545c8cbbcc1f2634d1d4e2e9 (patch)
treeba30d3c0b03f3fa41126455932341093ee48fcd5 /vendor
parent1d25ec4e79d5b9a22f4a6cbd73cac709b5a8d6e0 (diff)
downloadgitlab-ce-4683475118d14884545c8cbbcc1f2634d1d4e2e9.tar.gz
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'vendor')
-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