0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Bootstrap/docs/assets/js
Mark Otto 5cfde0d3a5 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/javascript/dropdowns.md
	less/utilities.less
2014-07-12 16:15:45 -07:00
..
src start markdowning getting started and moving things to separate pages 2014-07-10 17:54:06 -07:00
vendor Update uglify-js to v2.4.15. 2014-07-10 10:02:41 +03:00
customize.min.js Fixes #14095: Add basic styling for captions, which we've for some reason been missing all this time. 2014-07-12 15:55:15 -07:00
docs.min.js Merge branch 'master' into derp 2014-07-11 00:38:28 -07:00
ie10-viewport-bug-workaround.js Comply to the new style. 2014-06-06 01:23:07 +03:00
ie-emulation-modes-warning.js remove semicolons :'-( 2014-04-24 19:14:06 -07:00
raw-files.min.js grunt 2014-07-12 15:47:42 -07:00