summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-12 15:10:33 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-12 15:10:33 +0000
commit8ff63012e9b7e3dc2279e636868af9a438d1fa93 (patch)
tree4dd67f247345cbc2e8629c4a5f2b935dafc988e3 /vendor
parentef7cfec30c9fab7b9e757877c472ca7ca2eccc2d (diff)
downloadgitlab-ce-8ff63012e9b7e3dc2279e636868af9a438d1fa93.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