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
..
carousel.css	Fix carousel example images after c08bf4ba8b.	2015-02-16 11:39:14 +02:00
index.html	Merge branch 'v4' of https://github.com/twbs/derpstrap into v4	2015-05-27 15:49:55 -07:00