Skip to content

Commit

Permalink
Update copyright for 2k18 (twbs#25303)
Browse files Browse the repository at this point in the history
* Update copyright range to include 2018

* Extend copyright date range on new files from 2017 to include 2018
  • Loading branch information
mdo authored Jan 15, 2018
1 parent bcccfaa commit 0d110c8
Show file tree
Hide file tree
Showing 21 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The MIT License (MIT)

Copyright (c) 2011-2017 Twitter, Inc.
Copyright (c) 2011-2017 The Bootstrap Authors
Copyright (c) 2011-2018 Twitter, Inc.
Copyright (c) 2011-2018 The Bootstrap Authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,4 @@ See [the Releases section of our GitHub project](https://github.com/twbs/bootstr

## Copyright and license

Code and documentation copyright 2011-2017 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).
Code and documentation copyright 2011-2018 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).
4 changes: 2 additions & 2 deletions assets/js/src/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

/*!
* JavaScript for Bootstrap's docs (https://getbootstrap.com)
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see https://creativecommons.org/licenses/by/3.0/.
*/
Expand Down
4 changes: 2 additions & 2 deletions assets/scss/docs.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Bootstrap Docs (https://getbootstrap.com)
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see https://creativecommons.org/licenses/by/3.0/.
*/
Expand Down
4 changes: 2 additions & 2 deletions build/change-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

/*!
* Script to update version number references in the project.
* Copyright 2017 The Bootstrap Authors
* Copyright 2017 Twitter, Inc.
* Copyright 2017-2018 The Bootstrap Authors
* Copyright 2017-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

Expand Down
4 changes: 2 additions & 2 deletions build/generate-sri.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Remember to use the same vendor files as the CDN ones,
* otherwise the hashes won't match!
*
* Copyright 2017 The Bootstrap Authors
* Copyright 2017 Twitter, Inc.
* Copyright 2017-2018 The Bootstrap Authors
* Copyright 2017-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

Expand Down
4 changes: 2 additions & 2 deletions build/lint-vars.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
/*!
* Script to find unused Sass variables.
*
* Copyright 2017 The Bootstrap Authors
* Copyright 2017 Twitter, Inc.
* Copyright 2017-2018 The Bootstrap Authors
* Copyright 2017-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

Expand Down
4 changes: 2 additions & 2 deletions build/saucelabs-unit-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Script to run our Sauce Labs tests.
* Copyright 2017 The Bootstrap Authors
* Copyright 2017 Twitter, Inc.
* Copyright 2017-2018 The Bootstrap Authors
* Copyright 2017-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

Expand Down
4 changes: 2 additions & 2 deletions build/vnu-jar.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/*!
* Script to run vnu-jar if Java is available.
* Copyright 2017 The Bootstrap Authors
* Copyright 2017 Twitter, Inc.
* Copyright 2017-2018 The Bootstrap Authors
* Copyright 2017-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

Expand Down
2 changes: 1 addition & 1 deletion docs/4.0/examples/carousel/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ <h2 class="featurette-heading">And lastly, this one. <span class="text-muted">Ch
<!-- FOOTER -->
<footer class="container">
<p class="float-right"><a href="#">Back to top</a></p>
<p>&copy; 2017 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
<p>&copy; 2017-2018 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
</footer>
</main>

Expand Down
2 changes: 1 addition & 1 deletion docs/4.0/examples/checkout/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ <h4 class="mb-3">Payment</h4>
</div>

<footer class="my-5 pt-5 text-muted text-center text-small">
<p class="mb-1">&copy; 2017 Company Name</p>
<p class="mb-1">&copy; 2017-2018 Company Name</p>
<ul class="list-inline">
<li class="list-inline-item"><a href="#">Privacy</a></li>
<li class="list-inline-item"><a href="#">Terms</a></li>
Expand Down
2 changes: 1 addition & 1 deletion docs/4.0/examples/floating-labels/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h1 class="h3 mb-3 font-weight-normal">Floating labels</h1>
</label>
</div>
<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
<p class="mt-5 mb-3 text-muted text-center">&copy; 2017</p>
<p class="mt-5 mb-3 text-muted text-center">&copy; 2017-2018</p>
</form>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/4.0/examples/jumbotron/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ <h2>Heading</h2>
</main>

<footer class="container">
<p>&copy; Company 2017</p>
<p>&copy; Company 2017-2018</p>
</footer>

<!-- Bootstrap core JavaScript
Expand Down
2 changes: 1 addition & 1 deletion docs/4.0/examples/pricing/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h1 class="card-title pricing-card-title">$29 <small class="text-muted">/ mo</sm
<div class="row">
<div class="col-12 col-md">
<img class="mb-2" src="https://getbootstrap.com/assets/brand/bootstrap-solid.svg" alt="" width="24" height="24">
<small class="d-block mb-3 text-muted">&copy; 2017</small>
<small class="d-block mb-3 text-muted">&copy; 2017-2018</small>
</div>
<div class="col-6 col-md">
<h5>Features</h5>
Expand Down
2 changes: 1 addition & 1 deletion docs/4.0/examples/product/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h2 class="display-5">Another headline</h2>
<div class="row">
<div class="col-12 col-md">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="d-block mb-2"><circle cx="12" cy="12" r="10"></circle><line x1="14.31" y1="8" x2="20.05" y2="17.94"></line><line x1="9.69" y1="8" x2="21.17" y2="8"></line><line x1="7.38" y1="12" x2="13.12" y2="2.06"></line><line x1="9.69" y1="16" x2="3.95" y2="6.06"></line><line x1="14.31" y1="16" x2="2.83" y2="16"></line><line x1="16.62" y1="12" x2="10.88" y2="21.94"></line></svg>
<small class="d-block mb-3 text-muted">&copy; 2017</small>
<small class="d-block mb-3 text-muted">&copy; 2017-2018</small>
</div>
<div class="col-6 col-md">
<h5>Features</h5>
Expand Down
2 changes: 1 addition & 1 deletion docs/4.0/examples/sign-in/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h1 class="h3 mb-3 font-weight-normal">Please sign in</h1>
</label>
</div>
<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
<p class="mt-5 mb-3 text-muted">&copy; 2017</p>
<p class="mt-5 mb-3 text-muted">&copy; 2017-2018</p>
</form>
</body>
</html>
2 changes: 1 addition & 1 deletion nuget/bootstrap.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<projectUrl>https://getbootstrap.com/</projectUrl>
<iconUrl>https://getbootstrap.com/assets/img/favicons/apple-touch-icon.png</iconUrl>
<licenseUrl>https://github.com/twbs/bootstrap/blob/master/LICENSE</licenseUrl>
<copyright>Copyright 2017</copyright>
<copyright>Copyright 2017-2018</copyright>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
<dependency id="jQuery" version="[3.0.0,4)" />
Expand Down
2 changes: 1 addition & 1 deletion nuget/bootstrap.sass.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<projectUrl>https://getbootstrap.com/</projectUrl>
<iconUrl>https://getbootstrap.com/assets/img/favicons/apple-touch-icon.png</iconUrl>
<licenseUrl>https://github.com/twbs/bootstrap/blob/master/LICENSE</licenseUrl>
<copyright>Copyright 2017</copyright>
<copyright>Copyright 2017-2018</copyright>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
<dependency id="jQuery" version="[3.0.0,4)" />
Expand Down
4 changes: 2 additions & 2 deletions scss/bootstrap-grid.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Bootstrap Grid v4.0.0-beta.3 (https://getbootstrap.com)
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

Expand Down
4 changes: 2 additions & 2 deletions scss/bootstrap-reboot.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Bootstrap Reboot v4.0.0-beta.3 (https://getbootstrap.com)
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
*/
Expand Down
4 changes: 2 additions & 2 deletions scss/bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Bootstrap v4.0.0-beta.3 (https://getbootstrap.com)
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

Expand Down

0 comments on commit 0d110c8

Please sign in to comment.