summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-18 12:06:56 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-18 12:06:56 +0000
commit6cdc0f32fabea92606c8cda040a3d0875914b906 (patch)
tree8ce718efe3ac030c555d0294157107187c88ee75 /vendor
parent25989ab7ef1a444ed2abd5479f176d58e1d9462a (diff)
downloadgitlab-ce-6cdc0f32fabea92606c8cda040a3d0875914b906.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