Jacob Thornton 7f3b94c453 Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document ...

Conflicts:
	js/bootstrap-carousel.js

2012-10-17 23:05:16 -07:00

..

css

add updater function and rebuild

2012-10-17 21:37:34 -07:00

ico

new fav and touch icons to match new masthead

2012-07-30 10:33:48 -07:00

img

add in latest carousel example, reorg examples on getting started

2012-10-16 12:50:10 -05:00

js

Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document

2012-10-17 23:05:16 -07:00