Skip to content

Commit

Permalink
chore(merge main):patched commit → 5708adc (#2854)
Browse files Browse the repository at this point in the history
  • Loading branch information
louismaximepiton authored Jan 31, 2025
1 parent e0e0988 commit 6666f14
Show file tree
Hide file tree
Showing 27 changed files with 356 additions and 285 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) 2015-2024 Orange SA
Copyright (c) 2015-2024 The Boosted Authors
Copyright (c) 2015-2025 Orange SA
Copyright (c) 2015-2025 The Boosted 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 NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ End of the parts list under Monotype Imaging Inc Copyright


Parts list under Orange SA Copyright
Copyright (C) 2016 - 2024 Orange SA All rights reserved
Copyright (C) 2016 - 2025 Orange SA All rights reserved

The following parts are proprietary information of Orange.
You shall not use or display any trade names, trademarks, service marks, products names, illustrations or designs used within the software
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ Thanks to [Netlify](https://www.netlify.com/) for providing us with Deploy Previ

## Copyright and license

Code and documentation copyright 2011-2024 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors). Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
Code and documentation copyright 2011-2025 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors). Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

Boosted code and documentation copyright 2015-2024 the [Boosted Authors](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/graphs/contributors) and [Orange SA.](https://orange.com) Code released under the [MIT License](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
Boosted code and documentation copyright 2015-2025 the [Boosted Authors](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/graphs/contributors) and [Orange SA.](https://orange.com) Code released under the [MIT License](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

2 changes: 1 addition & 1 deletion build/build-plugins.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*!
* Script to build our plugins to use them separately.
* Copyright 2020-2024 The Bootstrap Authors
* Copyright 2020-2025 The Bootstrap Authors
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

Expand Down
2 changes: 1 addition & 1 deletion build/change-version.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

Expand Down
2 changes: 1 addition & 1 deletion build/generate-sri.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Remember to use the same vendor files as the CDN ones,
* otherwise the hashes won't match!
*
* Copyright 2017-2024 The Bootstrap Authors
* Copyright 2017-2025 The Bootstrap Authors
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

Expand Down
2 changes: 1 addition & 1 deletion build/vnu-jar.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

Expand Down
2 changes: 1 addition & 1 deletion build/zip-examples.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*!
* Script to create the built examples zip archive;
* requires the `zip` command to be present!
* Copyright 2020-2024 The Bootstrap Authors
* Copyright 2020-2025 The Bootstrap Authors
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

Expand Down
2 changes: 1 addition & 1 deletion nuget/boosted.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<repository type="git" url="https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap.git" branch="main" />
<icon>boosted.png</icon>
<license type="expression">MIT</license>
<copyright>Copyright 2015-2024</copyright>
<copyright>Copyright 2015-2025</copyright>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>css mobile-first responsive front-end framework web bootstrap</tags>
<contentFiles>
Expand Down
2 changes: 1 addition & 1 deletion nuget/boosted.sass.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<repository type="git" url="https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap.git" branch="main" />
<icon>boosted.png</icon>
<license type="expression">MIT</license>
<copyright>Copyright 2015-2024</copyright>
<copyright>Copyright 2015-2025</copyright>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>css sass mobile-first responsive front-end framework web bootstrap Orange</tags>
<contentFiles>
Expand Down
Loading

0 comments on commit 6666f14

Please sign in to comment.