diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-27 18:15:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-27 18:15:03 +0000 |
| commit | 3538972a0a6417e01f8e44c716d061520841cbce (patch) | |
| tree | 32f13d48f0c18858dade1f260e49208ad26f4c40 /.gitattributes | |
| parent | 1403e9bc459bcf37c9fdfb61aadd268d11b0abfd (diff) | |
| download | gitlab-ce-3538972a0a6417e01f8e44c716d061520841cbce.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 720e5f62549..1f5d554ef25 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ VERSION merge=ours Dangerfile gitlab-language=ruby -*.pdf filter=lfs diff=lfs merge=lfs -text *.rb diff=ruby workhorse/testdata/*.pdf -filter -diff -merge |