diff options
| author | Mark Otto <[email protected]> | 2013-11-30 23:35:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 23:35:56 -0800 |
| commit | 53047fa587fc8ca5cc0cad751f71fca5470d453a (patch) | |
| tree | a013806bef23a01e7ff0615f82b629703c553d6a /CONTRIBUTING.md | |
| parent | ba4c5dae9b8e34e90e86ba28aa6bd5acf3351f0d (diff) | |
| parent | 57070dcf4525fe82cab6a93300861867aa7f2d1e (diff) | |
| download | bootstrap-53047fa587fc8ca5cc0cad751f71fca5470d453a.tar.xz bootstrap-53047fa587fc8ca5cc0cad751f71fca5470d453a.zip | |
Merge branch 'master' into pr/11536
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c88a8d88..f00f3b780 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ## Pull requests -- CSS changes must be done in `.less` files first, never just the compiled `.css` files +- CSS changes must be done in `.less` files first, never just in the compiled `.css` files - If modifying the `.less` files, always recompile and commit the compiled files `bootstrap.css` and `bootstrap.min.css` - Try not to pollute your pull request with unintended changes--keep them simple and small - Try to share which browsers your code has been tested in before submitting a pull request |