mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
more license mentions
This commit is contained in:
parent
e8e60ae4bc
commit
40651cf1ea
11 changed files with 13 additions and 13 deletions
|
@ -18,7 +18,7 @@ module.exports = function (grunt) {
|
||||||
banner: '/*!\n' +
|
banner: '/*!\n' +
|
||||||
' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
|
' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
|
||||||
' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
|
' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
|
||||||
' * Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
|
' * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)\n' +
|
||||||
' */\n\n',
|
' */\n\n',
|
||||||
jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }\n\n',
|
jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }\n\n',
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
, "support": {
|
, "support": {
|
||||||
"issues": "https://github.com/twbs/bootstrap/issues"
|
"issues": "https://github.com/twbs/bootstrap/issues"
|
||||||
}
|
}
|
||||||
, "license": "Apache-2.0"
|
, "license": "MIT"
|
||||||
, "extra": {
|
, "extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.0.x-dev"
|
"dev-master": "3.0.x-dev"
|
||||||
|
|
2
dist/css/bootstrap-theme.css
vendored
2
dist/css/bootstrap-theme.css
vendored
|
@ -1,7 +1,7 @@
|
||||||
/*!
|
/*!
|
||||||
* Bootstrap v3.1.0 (http://getbootstrap.com)
|
* Bootstrap v3.1.0 (http://getbootstrap.com)
|
||||||
* Copyright 2013 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
2
dist/css/bootstrap-theme.min.css
vendored
2
dist/css/bootstrap-theme.min.css
vendored
|
@ -1,7 +1,7 @@
|
||||||
/*!
|
/*!
|
||||||
* Bootstrap v3.1.0 (http://getbootstrap.com)
|
* Bootstrap v3.1.0 (http://getbootstrap.com)
|
||||||
* Copyright 2013 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
2
dist/css/bootstrap.css
vendored
2
dist/css/bootstrap.css
vendored
|
@ -1,7 +1,7 @@
|
||||||
/*!
|
/*!
|
||||||
* Bootstrap v3.1.0 (http://getbootstrap.com)
|
* Bootstrap v3.1.0 (http://getbootstrap.com)
|
||||||
* Copyright 2013 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
|
@ -1,7 +1,7 @@
|
||||||
/*!
|
/*!
|
||||||
* Bootstrap v3.1.0 (http://getbootstrap.com)
|
* Bootstrap v3.1.0 (http://getbootstrap.com)
|
||||||
* Copyright 2013 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
2
dist/js/bootstrap.js
vendored
2
dist/js/bootstrap.js
vendored
|
@ -1,7 +1,7 @@
|
||||||
/*!
|
/*!
|
||||||
* Bootstrap v3.1.0 (http://getbootstrap.com)
|
* Bootstrap v3.1.0 (http://getbootstrap.com)
|
||||||
* Copyright 2013 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
|
if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
|
||||||
|
|
2
dist/js/bootstrap.min.js
vendored
2
dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -990,7 +990,7 @@ if (isAndroid) {
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<h1 id="license-faqs">License FAQs</h1>
|
<h1 id="license-faqs">License FAQs</h1>
|
||||||
</div>
|
</div>
|
||||||
<p class="lead">Bootstrap is released under the Apache 2 license and is copyright {{ site.time | date: "%Y" }} Twitter. Boiled down to smaller chunks, it can be described with the following conditions.</p>
|
<p class="lead">Bootstrap is released under the MIT license and is copyright {{ site.time | date: "%Y" }} Twitter. Boiled down to smaller chunks, it can be described with the following conditions.</p>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12 col-lg-6">
|
<div class="col-12 col-lg-6">
|
||||||
|
@ -1025,7 +1025,7 @@ if (isAndroid) {
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p>The full Bootstrap license is located <a href="{{ site.repo }}/blob/master/README.md">in the project repository</a> for more information.</p>
|
<p>The full Bootstrap license is located <a href="{{ site.repo }}/blob/master/LICENSE">in the project repository</a> for more information.</p>
|
||||||
</div><!-- /.bs-docs-section -->
|
</div><!-- /.bs-docs-section -->
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
},
|
},
|
||||||
"licenses": [
|
"licenses": [
|
||||||
{
|
{
|
||||||
"type": "Apache-2.0",
|
"type": "MIT",
|
||||||
"url": "http://www.apache.org/licenses/LICENSE-2.0"
|
"url": "https://github.com/twbs/bootstrap/blob/master/LICENSE"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
Loading…
Reference in a new issue