8000 Merge branch 'main' of https://github.com/coreui/coreui into feat-ste… · coreui/coreui-pro@1565eee · GitHub
[go: up one dir, main page]
Skip to content

Commit 1565eee

Browse files
mrholekmrholek
committed
Merge branch 'main' of https://github.com/coreui/coreui into feat-stepper
# Conflicts: # README.md # dist/css/coreui-grid.css.map # dist/css/coreui-grid.rtl.css.map # dist/css/coreui-grid.rtl.min.css.map # dist/css/coreui-reboot.css.map # dist/css/coreui-reboot.min.css.map # dist/css/coreui-reboot.rtl.css.map # dist/css/coreui-reboot.rtl.min.css.map # dist/css/coreui-utilities.css.map # dist/css/coreui-utilities.min.css.map # dist/css/coreui-utilities.rtl.css.map # dist/css/coreui-utilities.rtl.min.css.map # dist/css/coreui.css.map # dist/css/coreui.min.css # dist/css/coreui.min.css.map # dist/css/coreui.rtl.css.map # dist/css/coreui.rtl.min.css # dist/css/coreui.rtl.min.css.map # dist/css/themes/bootstrap/bootstrap.css.map # dist/css/themes/bootstrap/bootstrap.min.css # dist/css/themes/bootstrap/bootstrap.min.css.map # dist/css/themes/bootstrap/bootstrap.rtl.css.map # dist/css/themes/bootstrap/bootstrap.rtl.min.css # dist/css/themes/bootstrap/bootstrap.rtl.min.css.map # dist/js/bootstrap.bundle.js # dist/js/bootstrap.bundle.js.map # dist/js/bootstrap.bundle.min.js # dist/js/bootstrap.bundle.min.js.map # dist/js/bootstrap.esm.js # dist/js/bootstrap.esm.js.map # dist/js/bootstrap.esm.min.js # dist/js/bootstrap.esm.min.js.map # dist/js/bootstrap.js # dist/js/bootstrap.js.map # dist/js/bootstrap.min.js # dist/js/bootstrap.min.js.map # dist/js/coreui.bundle.js # dist/js/coreui.bundle.js.map # dist/js/coreui.bundle.min.js # dist/js/coreui.bundle.min.js.map # dist/js/coreui.esm.js # dist/js/coreui.esm.js.map # dist/js/coreui.esm.min.js # dist/js/coreui.esm.min.js.map # dist/js/coreui.js # dist/js/coreui.js.map # dist/js/coreui.min.js # dist/js/coreui.min.js.map # hugo.yml # js/dist/alert.js # js/dist/base-component.js # js/dist/base-component.js.map # js/dist/button.js # js/dist/carousel.js # js/dist/collapse.js # js/dist/dom/data.js # js/dist/dom/event-handler.js # js/dist/dom/manipulator.js # js/dist/dom/selector-engine.js # js/dist/dropdown.js # js/dist/modal.js # js/dist/navigation.js # js/dist/offcanvas.js # js/dist/popover.js # js/dist/scrollspy.js # js/dist/sidebar.js # js/dist/tab.js # js/dist/toast.js # js/dist/tooltip.js # js/dist/util/backdrop.js # js/dist/util/component-functions.js # js/dist/util/config.js # js/dist/util/focustrap.js # js/dist/util/index.js # js/dist/util/sanitizer.js # js/dist/util/scrollbar.js # js/dist/util/swipe.js # js/dist/util/template-factory.js # js/src/base-component.js # package-lock.json # package.js # package.json
2 parents b3ac1be + f5a1772 commit 1565eee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+492
-91
lines changed

‎dist/css/coreui-grid.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/coreui-grid.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/coreui-grid.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/coreui-grid.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/coreui-grid.rtl.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/coreui-grid.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/coreui-grid.rtl.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/coreui-grid.rtl.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/coreui-reboot.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/coreui-reboot.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0