summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 15:10:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 15:10:28 +0000
commit63324f9cfd863cda2f717835efc933cdd5ade792 (patch)
tree65717323c2d3f1f35ebff2441823f16aa9e27eb0 /vendor
parent4944e9e5a9a3f57998c5033b10cdfa2975b71227 (diff)
downloadgitlab-ce-63324f9cfd863cda2f717835efc933cdd5ade792.tar.gz
Add latest changes from gitlab-org/gitlab@master
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