diff options
| author | Mark Otto <[email protected]> | 2014-02-08 16:01:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 16:01:56 -0800 |
| commit | e3cfd5821db94df0d6eb483d1f859da9dddd55a8 (patch) | |
| tree | 8af2dc5a1442b8974ecc7809ca516f2c67fde39b /package.json | |
| parent | 08ff305ed7ba689238d4524b0285d37d15aaf8fa (diff) | |
| parent | 842af44fccb338f165eb2ea64bdaffd999850881 (diff) | |
| download | bootstrap-e3cfd5821db94df0d6eb483d1f859da9dddd55a8.tar.xz bootstrap-e3cfd5821db94df0d6eb483d1f859da9dddd55a8.zip | |
Merge branch 'master' into pr/12462
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/package.json b/package.json index b93ae15ba..8e6c43494 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,10 @@ "bugs": { "url": "https://github.com/twbs/bootstrap/issues" }, - "licenses": [ - { - "type": "MIT", - "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" - } - ], + "license": { + "type": "MIT", + "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" + }, "devDependencies": { "browserstack-runner": "~0.1.0", "btoa": "~1.1.1", |