summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-02 17:13:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-02 17:13:35 +0000
commit4bafeeda963a11ce4004bbe35a4ff2606bc4d10a (patch)
tree6b8e5ba6bff131df8d059d24ace27622879e3f00 /vendor
parent99112fa3868501e82762a50561b999743261733f (diff)
downloadgitlab-ce-4bafeeda963a11ce4004bbe35a4ff2606bc4d10a.tar.gz
Add latest changes from gitlab-org/gitlab@13-5-stable-ee
Diffstat (limited to 'vendor')
-rw-r--r--[-rwxr-xr-x]vendor/gitignore/C++.gitignore0
-rw-r--r--[-rwxr-xr-x]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 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