mrmrs 0b415c6099 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

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

..

brand

Normalize line endings

2014-03-07 10:22:57 +02:00

css

Reorganize docs assets

2014-03-07 17:37:23 +01:00

ico

Rearrange repository contents because muahahahahahaha

2013-12-28 22:47:03 -08:00

img

Docs: losslessly compress images.

2014-02-04 11:33:28 +02:00

js

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

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