Skip to content

Commit 043c19c

Browse files
authored
Merge branch 'master' into bpang-runtest
2 parents cae6d66 + 76f1721 commit 043c19c

File tree

793 files changed

+12580
-7705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

793 files changed

+12580
-7705
lines changed

Diff for: .gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
src/etc/installer/gfx/* binary
99
*.woff binary
1010
src/vendor/** -text
11-
Cargo.lock -merge linguist-generated=false
11+
Cargo.lock linguist-generated=false
1212

1313
# Older git versions try to fix line endings on images, this prevents it.
1414
*.png binary

0 commit comments

Comments
 (0)