summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-17 19:33:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-17 19:33:35 +0000
commitca705ceb5761d28befc5edaf0eb4b24d6988ecbb (patch)
treec5c18c3f204b0c039f550a54e5e70355be8f9bfe /vendor
parent1ace5d8b610df530b5c82b68f1a353460ef4854c (diff)
downloadgitlab-ce-ca705ceb5761d28befc5edaf0eb4b24d6988ecbb.tar.gz
Add latest changes from gitlab-org/gitlab@13-10-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