rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #12605 from ZDroid/license-object

Browse Source 
Use license object instead of licenses array
This commit is contained in:
XhmikosR 2014-02-06 21:04:36 +02:00
commit 119ed54bd1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -30,7 +30,7 @@ module.exports = function (grunt) {
banner: '/*!\n' +
' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\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',
jqueryCheck: 'if (typeof jQuery === \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n',

10
package.json
View File

@ -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",