0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Commit Graph

5 Commits

Author SHA1 Message Date
Mark Otto
057d0a00ed markdownify js dropdowns 2014-07-13 00:54:26 -07:00
Mark Otto
d85e6af91b Merge branch 'master' into derp
Conflicts:
	docs/_includes/components/alerts.html
	docs/javascript/dropdowns.md
2014-07-13 00:23:09 -07:00
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
Mark Otto
9bf9fb1faa frontmatter all that shit 2014-07-12 02:20:15 -07:00
Mark Otto
2e4bbb1cb6 move over all js pages 2014-07-12 02:17:42 -07:00