summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-16 09:54:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-16 09:54:47 +0000
commit9bf0c33b634f078e3b6419ec6d59297ebde34cc1 (patch)
treecb704ed4e2e9835e771da07ada58c9370df64583 /vendor
parent453396ed5b1e1a0f4eca6b3d575405229bf417fd (diff)
downloadgitlab-ce-9bf0c33b634f078e3b6419ec6d59297ebde34cc1.tar.gz
Add latest changes from gitlab-org/gitlab@12-5-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