summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-10 07:53:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-10 07:53:40 +0000
commitcfc792b9ca064990e6540cb742e80529ea669a81 (patch)
tree147cd4256319990cebbc02fe8e4fbbbe06f5720a /.gitattributes
parent93c6764dacd4c605027ef1cd367d3aebe420b223 (diff)
downloadgitlab-ce-cfc792b9ca064990e6540cb742e80529ea669a81.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 55c422f0f8c..ec47d175c55 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
VERSION merge=ours
Dangerfile gitlab-language=ruby
+*.pdf filter=lfs diff=lfs merge=lfs -text