diff options
| author | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
| commit | 4fc2907723e7f7bb5b14eb5cec94d629b6834e7f (patch) | |
| tree | a9c1df41fbf5f912234f762f03668ea4ef9fd2b7 /.gitattributes | |
| parent | 0e8baab34ae21c813afb9d8c24b3cb2105aebc46 (diff) | |
| parent | 9966d035cd35c510369286cbb645340bdd6ffc95 (diff) | |
| download | bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.tar.xz bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs-assets/css/docs.css
docs-assets/js/application.js
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..0c6b2fea5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +# Enforce Unix newlines +*.css text eol=lf +*.html text eol=lf +*.js text eol=lf +*.json text eol=lf +*.less text eol=lf +*.md text eol=lf +*.yml text eol=lf |