summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-19 11:15:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-19 11:15:21 +0000
commitda99336b3b92f0ac9a656a20df9bd869409ef7b5 (patch)
tree7f2624fe832f3c8fbb811b33e0407fcf9d7363a4 /vendor
parent7e9c479f7de77702622631cff2628a9c8dcbc627 (diff)
downloadgitlab-ce-da99336b3b92f0ac9a656a20df9bd869409ef7b5.tar.gz
Add latest changes from gitlab-org/gitlab@13-6-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