• mrmrs's avatar
    Merge branch 'master' into mixin-table-of-contents · 0b415c60
    mrmrs authored
    * 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
    0b415c60
Name
Last commit
Last update
dist Loading commit data...
docs Loading commit data...
fonts Loading commit data...
grunt Loading commit data...
js Loading commit data...
less Loading commit data...
test-infra Loading commit data...
.editorconfig Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.travis.yml Loading commit data...
CNAME Loading commit data...
CONTRIBUTING.md Loading commit data...
Gruntfile.js Loading commit data...
LICENSE Loading commit data...
README.md Loading commit data...
_config.yml Loading commit data...
bower.json Loading commit data...
composer.json Loading commit data...
package.json Loading commit data...