Merge branch '1.1.1-wip'

joelost · Aug 26, 2011 · a63fb4d · a63fb4d
2 parents 5193619 + 273659c
commit a63fb4d
Show file tree

Hide file tree

Showing 15 changed files with 1,182 additions and 825 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.1.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.1.0.min.css
+BOOTSTRAP = ./bootstrap-1.1.1.css
+BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
 LESS_COMPESSOR ?= `which lessc`
 WATCHR ?= `which watchr`

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Here's what the LESS version looks like:
 
 Or if you prefer, the standard css way:
 
-    <link rel="stylesheet" type="text/css" href="bootstrap-1.1.0.css">
+    <link rel="stylesheet" type="text/css" href="bootstrap-1.1.1.css">
 
 For more info, refer to the docs!