summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-28 21:09:15 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-28 21:09:15 +0000
commit8831c2df7fa3f1bb567e284e4b8c0a4f441e74b3 (patch)
tree36b1b430075ff6e63524be14585dbb614e893e8c /vendor
parent1c8fa70f9d0818e2a82089c8643a6e455bca47fd (diff)
downloadgitlab-ce-8831c2df7fa3f1bb567e284e4b8c0a4f441e74b3.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