diff options
| author | Chris Rebert <[email protected]> | 2015-09-07 23:20:16 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-09-07 23:20:16 -0700 |
| commit | 21dadc870affb1c7da2501a022f80472a7ccfb59 (patch) | |
| tree | ae5a8c486a19f1d7f89b70eaced3f6295909c53c | |
| parent | 36e4c9bffcae40cde42b6baa28961a8979cc24d0 (diff) | |
| parent | d99bc3fe6238aa1398ad5afab8130b47bb2f0c9d (diff) | |
| download | bootstrap-21dadc870affb1c7da2501a022f80472a7ccfb59.tar.xz bootstrap-21dadc870affb1c7da2501a022f80472a7ccfb59.zip | |
Merge pull request #17521 from vsn4ik/rm_v3_theme
v4 - Remove dropped v3 bootstrap-theme
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 7c22a49fb..5788b1228 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,6 +12,5 @@ # 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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff89537ba..abea47484 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -135,7 +135,7 @@ Please adhere to the [coding guidelines](#code-guidelines) used throughout the project (indentation, accurate comments, etc.) and any other requirements (such as test coverage). -**Do not edit `bootstrap.css`, `bootstrap-theme.css`, or `bootstrap.js` +**Do not edit `bootstrap.css`, or `bootstrap.js` directly!** Those files are automatically generated. You should edit the source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/master/scss) and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/master/js) instead. |