diff options
| author | zotlabs <mike@macgirvin.com> | 2018-09-10 22:11:26 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-09-10 22:11:26 -0700 |
| commit | adc164b825c3b9e322921f2da9d1baf178b04cd3 (patch) | |
| tree | fa5e805e53e7661ad936873e1a66017ad9dcd6a9 /vendor/twbs/bootstrap/.gitattributes | |
| parent | be3b6304742a6c39d73674b1f7422c029e7cd804 (diff) | |
| parent | c6abe87ec2e08fc38ff9c505ac2000d52d45c228 (diff) | |
| download | volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.tar.gz volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.tar.bz2 volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'vendor/twbs/bootstrap/.gitattributes')
| -rw-r--r-- | vendor/twbs/bootstrap/.gitattributes | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/vendor/twbs/bootstrap/.gitattributes b/vendor/twbs/bootstrap/.gitattributes new file mode 100644 index 000000000..39813c758 --- /dev/null +++ b/vendor/twbs/bootstrap/.gitattributes @@ -0,0 +1,18 @@ +# Enforce Unix newlines +*.css text eol=lf +*.html text eol=lf +*.js text eol=lf +*.json text eol=lf +*.md text eol=lf +*.rb text eol=lf +*.scss text eol=lf +*.svg text eol=lf +*.txt text eol=lf +*.xml text eol=lf +*.yml text eol=lf + +# Don't diff or textually merge source maps +*.map binary + +bootstrap.css linguist-vendored=false +bootstrap.js linguist-vendored=false |