summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-05 21:03:15 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-05 21:03:15 +0000
commita71e085b2314acd764bd9883dd236998e2f9cd4c (patch)
treeeb69de459c9b21a198c18f5ea2fcefbaea9775d0 /vendor
parent5049b3cd2362d119d0f6147bb45b449609b07cb4 (diff)
downloadgitlab-ce-a71e085b2314acd764bd9883dd236998e2f9cd4c.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