diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /.gitattributes | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index f14050368..5788b1228 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,13 +3,14 @@ *.html text eol=lf *.js text eol=lf *.json text eol=lf -*.less text eol=lf *.md text eol=lf +*.py text eol=lf +*.rb text eol=lf +*.scss text eol=lf *.svg text eol=lf *.yml text eol=lf # Don't diff or textually merge source maps *.map binary -bootstrap-theme.css linguist-vendored=false bootstrap.css linguist-vendored=false bootstrap.js linguist-vendored=false |