summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-01 16:23:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-01 16:23:21 +0000
commita97ccf1330bc0697e05cdac37ffd5597b6fc4eea (patch)
tree69b70aee8fad3942c2c28a5c859945b5f856e59e /vendor
parentb935f5eb494e4eeb24ea058c03436eae5eb66c6a (diff)
downloadgitlab-ce-a97ccf1330bc0697e05cdac37ffd5597b6fc4eea.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