Mark Otto 4876cbeef8 Merge branch 'master' into pr/11412 ...

Conflicts:
	dist/js/bootstrap.min.js

2013-12-01 20:27:30 -08:00

..

css

Merge branch 'master' into pr/11412

2013-12-01 20:27:30 -08:00

ico

move /assets/ to /docs-assets/ ; fixes #10715

2013-09-23 13:02:26 -07:00

js

bump version numbers to 3.0.3

2013-12-01 19:31:52 -08:00