]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
projects / thirdparty / bootstrap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71e9902 4bf0645)
Merge branch 'master' into mixin-table-of-contents
authormrmrs <hi@mrmrs.cc>
Sun, 9 Mar 2014 23:40:40 +0000 (16:40 -0700)
committermrmrs <hi@mrmrs.cc>
Sun, 9 Mar 2014 23:40:40 +0000 (16:40 -0700)
commit0b415c6099af274e13564d429ed9551004c71b5e
tree2ba50400477fcbbcd08358cb5bab1f5e573659e3tree | snapshot
parent71e9902d9a4ee0bf8bc94b4c3123a92a52d6ef65commit | diff
parent4bf0645060fb421c9b9f6f3309aceb42dd6e3407commit | diff
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
docs/assets/js/customize.min.js diff1 | diff2 | blob | history
docs/assets/js/raw-files.min.js diff1 | diff2 | blob | history
Mirror of https://github.com/twbs/bootstrap.git