From: Zlatan Vasović <legospace9876@gmail.com>
Date: Thu, 6 Feb 2014 10:37:39 +0000 (+0100)
Subject: Use license object instead of licenses array
X-Git-Tag: v3.2.0~403^2~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96fd2dca020d6c43c5797cc29caec7bedb917d79;p=thirdparty%2Fbootstrap.git

Use license object instead of licenses array
---

diff --git a/Gruntfile.js b/Gruntfile.js
index acef4100a5..8fa1bbe7db 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -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',
 
diff --git a/package.json b/package.json
index b93ae15bab..8e6c434941 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",