diff options
| author | Mark Otto <[email protected]> | 2013-12-18 16:19:46 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 16:19:46 -0800 |
| commit | 07705673b6398ae9cfe2cb59b97d61e04efeb8bf (patch) | |
| tree | 4f105edd66b0c13a8a99a636b4aef0bb640b883d /package.json | |
| parent | bc265ac64798c01b2f35ca48ef1a65025e0c71b5 (diff) | |
| parent | 3315d4d9f4c47e67f1d1c9f6a0b262a5d8b688bd (diff) | |
| download | bootstrap-07705673b6398ae9cfe2cb59b97d61e04efeb8bf.tar.xz bootstrap-07705673b6398ae9cfe2cb59b97d61e04efeb8bf.zip | |
Merge branch 'master' into docs_derp
Conflicts:
_layouts/default.html
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index f4633e83a..dbb921a66 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.", @@ -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": { |