Skip to content

Commit d2e2993

Browse files
committed
Merge branch 'v5' of https://github.com/coreui/coreui into v5
2 parents 19e93e4 + 84b479c commit d2e2993

Some content is hidden

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

58 files changed

+177
-50
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@
4343

4444
Several quick start options are available:
4545

46+
<<<<<<< HEAD
4647
- [Download the latest release](https://github.com/coreui/coreui-pro/archive/v5.0.0-beta.0.zip)
48+
=======
49+
- [Download the latest release](https://github.com/coreui/coreui/archive/v5.0.0-beta.1.zip)
50+
>>>>>>> 84b479c2210e49ae04a1e14ef5b0a509d23ffdf9
4751
- Clone the repo: `git clone https://github.com/coreui/coreui.git`
4852
- Install with [npm](https://www.npmjs.com/): `npm install @coreui/coreui`
4953
- Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/coreui`

dist/css/coreui-grid.css

Lines changed: 4 additions & 0 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

Lines changed: 4 additions & 0 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

Lines changed: 4 additions & 0 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

Lines changed: 4 additions & 0 deletions
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: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-reboot.min.css

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

dist/css/coreui-reboot.rtl.css

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

0 commit comments

Comments
 (0)