summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-17 17:02:16 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-17 17:02:16 +0000
commitba21be7f1d4c8fc99412274a70c89a1c83d0331f (patch)
treea48ff0443d7c7ce026cb9cd252ab5c1a2253a22d /vendor
parentf64a639bcfa1fc2bc89ca7db268f594306edfd7c (diff)
downloadgitlab-ce-ba21be7f1d4c8fc99412274a70c89a1c83d0331f.tar.gz
Add latest changes from gitlab-org/gitlab@13-10-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