Commit 96fd2dca authored by Zlatan Vasović's avatar Zlatan Vasović

Use license object instead of licenses array

parent 7eb53226
...@@ -30,7 +30,7 @@ module.exports = function (grunt) { ...@@ -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',
......
...@@ -20,12 +20,10 @@ ...@@ -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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment