0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-28 20:52:21 +01:00

Merge branch 'master' into carousel_indicators_ie

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-10-20 16:49:18 -07:00
commit ac6a7f044e

View File

@ -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>!