Merge branch 'master' into mixin-table-of-contents

Browse Source

* 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

...

This commit is contained in:

mrmrs

2014-03-09 16:40:40 -07:00

parent 71e9902d9a 4bf0645060

commit 0b415c6099

10 changed files with 57 additions and 52 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

docs/assets/js/customize.min.js

Vendored

+1 -1

File diff suppressed because one or more lines are too long