Commit ac6a7f04 authored by Mark Otto's avatar Mark Otto

Merge branch 'master' into carousel_indicators_ie

Conflicts:
	dist/css/bootstrap.min.css
parents 6a93a6b8 ecc6d987
......@@ -2,7 +2,7 @@
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
To get started, check out [http://getbootstrap.com](http://getbootstrap.com)!
To get started, check out <http://getbootstrap.com>!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment