summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-30 18:06:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-30 18:06:34 +0000
commitb4cdff15ca53312ccbbafe4effac85b1ee4420ae (patch)
tree85ecd924d542c6615d04e0756bbad7481d8d5228 /vendor
parent538fff823de57d1ba5317961aa43091de9dc007f (diff)
downloadgitlab-ce-b4cdff15ca53312ccbbafe4effac85b1ee4420ae.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rwxr-xr-x[-rw-r--r--]vendor/gitignore/C++.gitignore0
-rwxr-xr-x[-rw-r--r--]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 100644..100755
--- 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 100644..100755
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore