]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge remote-tracking branch 'remotes/origin/v513'
authorXhmikosR <xhmikosr@gmail.com>
Sat, 9 Oct 2021 15:28:28 +0000 (18:28 +0300)
committerXhmikosR <xhmikosr@gmail.com>
Sat, 9 Oct 2021 15:28:28 +0000 (18:28 +0300)
17 files changed:
1  2 
README.md
js/src/base-component.js
js/src/carousel.js
js/src/collapse.js
js/src/dom/event-handler.js
js/src/dom/manipulator.js
js/src/dropdown.js
js/src/modal.js
js/src/offcanvas.js
js/src/scrollspy.js
js/src/tab.js
js/src/tooltip.js
js/src/util/index.js
js/src/util/sanitizer.js
js/src/util/scrollbar.js
package-lock.json
package.json

diff --cc README.md
index d6f4fd445248b2aea53817fb2a3fc8a8885c1639,b354fb6f3622b984cfe83568575beabda6272ac4..bb0aae58761fb546b24e795145b99ad0e3648396
+++ b/README.md
@@@ -50,10 -50,10 +50,10 @@@ Several quick start options are availab
  - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
  - Install with [npm](https://www.npmjs.com/): `npm install bootstrap`
  - Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap`
- - Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.1.2`
+ - Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.1.3`
  - Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap` Sass: `Install-Package bootstrap.sass`
  
 -Read the [Getting started page](https://getbootstrap.com/docs/5.1/getting-started/introduction/) for information on the framework contents, templates and examples, and more.
 +Read the [Getting started page](https://getbootstrap.com/docs/5.1/getting-started/introduction/) for information on the framework contents, templates, examples, and more.
  
  
  ## Status
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc js/src/modal.js
Simple merge
Simple merge
Simple merge
diff --cc js/src/tab.js
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc package.json
Simple merge