summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-02 15:07:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-02 15:07:40 +0000
commitd83c512077b9eb391ce1f59349fc7bacc3615e18 (patch)
tree1864abd445bddfe750358b054d43b52a13675e17 /vendor
parenta72a9af092c1bfcf9f8024d59c11cf222f07e1e7 (diff)
downloadgitlab-ce-d83c512077b9eb391ce1f59349fc7bacc3615e18.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