summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-04 15:07:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-04 15:07:36 +0000
commitaa542224bb345acf0cb9a1a606f0a802c16b0336 (patch)
tree496540a29aec55c6faeec7b0140824547046ae6c /vendor
parent2494b608a460c46c759ad84bb29e6cc3447499a1 (diff)
downloadgitlab-ce-aa542224bb345acf0cb9a1a606f0a802c16b0336.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