From e8e60ae4bce85eed17c7e6801b72404494ef436a Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 18 Dec 2013 14:56:08 -0800
Subject: version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index f4633e83a..5f2a1582e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap",
   "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "keywords": ["bootstrap", "css"],
   "homepage": "http://getbootstrap.com",
   "author": "Twitter, Inc.",
-- 
cgit v1.2.3


From 40651cf1ea9caa97bf7af81e44eed5f30e8b896b Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 18 Dec 2013 15:08:16 -0800
Subject: more license mentions

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 5f2a1582e..dbb921a66 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
   },
   "licenses": [
     {
-      "type": "Apache-2.0",
-      "url": "http://www.apache.org/licenses/LICENSE-2.0"
+      "type": "MIT",
+      "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE"
     }
   ],
   "devDependencies": {
-- 
cgit v1.2.3