summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-04 18:06:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-04 18:06:28 +0000
commit7b25b12016eeca73262cf2a618b411fb911295e1 (patch)
tree9198dc42c9f1151184f276d11d90c5193544eb1c /vendor
parentaa542224bb345acf0cb9a1a606f0a802c16b0336 (diff)
downloadgitlab-ce-7b25b12016eeca73262cf2a618b411fb911295e1.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