aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-09-17 18:25:40 -0700
committerJacob Thornton <[email protected]>2011-09-17 18:25:40 -0700
commit3eafbe5c8994e884744e4a664be51ab5b6558b80 (patch)
tree650248895a259ac6654dddeacbfa109a2a10aece
parent39a16811eb09b1a874d5a68dcd31808edb14a5b5 (diff)
downloadbootstrap-3eafbe5c8994e884744e4a664be51ab5b6558b80.tar.xz
bootstrap-3eafbe5c8994e884744e4a664be51ab5b6558b80.zip
change version in makefile to 1.3
-rw-r--r--Makefile2
-rw-r--r--bootstrap.css4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b3dce89ac..2979b3d53 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.2.0
+VERSION=1.3.0
DATE=$(shell DATE)
BOOTSTRAP = ./bootstrap.css
BOOTSTRAP_MIN = ./bootstrap.min.css
diff --git a/bootstrap.css b/bootstrap.css
index 8b6fe3eb4..11401b36b 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -1,12 +1,12 @@
/*!
- * Bootstrap v1.2.0
+ * Bootstrap v1.3.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Sep 16 14:07:03 PDT 2011
+ * Date: Sat Sep 17 18:25:32 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).