diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-02 21:09:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-02 21:09:35 +0300 |
| commit | ad05e1db038a2e983d25555144fa29063e060c50 (patch) | |
| tree | 36f9c8b4d1d300b69e00c14793303c10cd020f2a /.gitattributes | |
| parent | 1bdf79827c623cc92504223a1085f366115bbb3d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 8d21784ed11..720e5f62549 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,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 |