Mark Otto 663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 ...

Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css

2015-05-27 15:49:55 -07:00

..

alert.js

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

button.js

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

carousel.js

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

collapse.js

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

dropdown.js

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

modal.js

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

popover.js

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

scrollspy.js

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

tab.js

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

tooltip.js

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

util.js

al tests passing, dist rebuilt, w/typechecker

2015-05-13 14:52:46 -07:00