diff options
| author | mrmrs <[email protected]> | 2014-03-09 16:40:40 -0700 |
|---|---|---|
| committer | mrmrs <[email protected]> | 2014-03-09 16:40:40 -0700 |
| commit | 0b415c6099af274e13564d429ed9551004c71b5e (patch) | |
| tree | 2ba50400477fcbbcd08358cb5bab1f5e573659e3 /docs/dist/css | |
| parent | 71e9902d9a4ee0bf8bc94b4c3123a92a52d6ef65 (diff) | |
| parent | 4bf0645060fb421c9b9f6f3309aceb42dd6e3407 (diff) | |
| download | bootstrap-0b415c6099af274e13564d429ed9551004c71b5e.tar.xz bootstrap-0b415c6099af274e13564d429ed9551004c71b5e.zip | |
Merge branch 'master' into mixin-table-of-contents
* master:
Fix bad grunt merge and then G R U N T
Reorder the Gruntfile a bit
Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube
Remove unneeded quotes.
Rename generateRawFilesJs to generateRawFiles
Remove redundant parens
Conflicts:
docs/assets/js/raw-files.min.js
test-infra/npm-shrinkwrap.canonical.json
Diffstat (limited to 'docs/dist/css')
0 files changed, 0 insertions, 0 deletions