Merge branch 'master' into pr/11107
Conflicts: docs-assets/js/raw-files.js
Showing
+1616 -393
.csscomb.json
0 → 100644
.csslintrc
0 → 100644
.gitattributes
0 → 100644
LICENSE-MIT
0 → 100644
browserstack.json
deleted
100644 → 0
... | @@ -17,4 +17,9 @@ | ... | @@ -17,4 +17,9 @@ |
"issues": "https://github.com/twbs/bootstrap/issues" | "issues": "https://github.com/twbs/bootstrap/issues" | ||
} | } | ||
, "license": "Apache-2.0" | , "license": "Apache-2.0" | ||
, "extra": { | |||
"branch-alias": { | |||
"dev-master": "3.0.x-dev" | |||
} | |||
} | |||
} | } |
Please register or sign in to comment