summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-21 14:14:25 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-21 14:14:25 +0000
commit4177ade69aea16948ba097e67ed7ebe05f6e1993 (patch)
tree1105d823b0e1bf5e6f1fc377a5025434f6b46f75 /vendor
parent9dc93a4519d9d5d7be48ff274127136236a3adb3 (diff)
downloadgitlab-ce-4177ade69aea16948ba097e67ed7ebe05f6e1993.tar.gz
Add latest changes from gitlab-org/gitlab@13-11-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