summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-04 18:08:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-04 18:08:46 +0000
commitb41cd8cb92d53454b2b160ba922d33801933a9cf (patch)
tree3519da8856f8bf12ce9e75248e5ecb9ed4eacf14 /vendor
parent8d3aee3636da5181ae94d23b47c6794b5610ab01 (diff)
downloadgitlab-ce-b41cd8cb92d53454b2b160ba922d33801933a9cf.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