Merge pull request #12605 from ZDroid/license-object
Use license object instead of licenses array
This commit is contained in:
commit
119ed54bd1
|
@ -30,7 +30,7 @@ module.exports = function (grunt) {
|
||||||
banner: '/*!\n' +
|
banner: '/*!\n' +
|
||||||
' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
|
' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
|
||||||
' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
|
' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
|
||||||
' * Licensed under <%= _.pluck(pkg.licenses, "type") %> (<%= _.pluck(pkg.licenses, "url") %>)\n' +
|
' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' +
|
||||||
' */\n',
|
' */\n',
|
||||||
jqueryCheck: 'if (typeof jQuery === \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n',
|
jqueryCheck: 'if (typeof jQuery === \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n',
|
||||||
|
|
||||||
|
|
10
package.json
10
package.json
|
@ -20,12 +20,10 @@
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/twbs/bootstrap/issues"
|
"url": "https://github.com/twbs/bootstrap/issues"
|
||||||
},
|
},
|
||||||
"licenses": [
|
"license": {
|
||||||
{
|
"type": "MIT",
|
||||||
"type": "MIT",
|
"url": "https://github.com/twbs/bootstrap/blob/master/LICENSE"
|
||||||
"url": "https://github.com/twbs/bootstrap/blob/master/LICENSE"
|
},
|
||||||
}
|
|
||||||
],
|
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"browserstack-runner": "~0.1.0",
|
"browserstack-runner": "~0.1.0",
|
||||||
"btoa": "~1.1.1",
|
"btoa": "~1.1.1",
|
||||||
|
|
Loading…
Reference in New Issue