Skip to content
This repository has been archived by the owner on Jun 5, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/5app/base5-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
diondiondion committed Jun 24, 2020
2 parents 486d429 + 3d6eda6 commit 78bceb3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# [10.2.0](https://github.com/5app/base5-ui/compare/v10.1.2...v10.2.0) (2020-06-18)


### Bug Fixes

* Prevent custom props from reaching DOM ([fe9a17e](https://github.com/5app/base5-ui/commit/fe9a17e16009bc2de40034ca138fd2d4e7801fb3))


### Features

* **styleProps:** Accept function for themeProps ([5af3b6e](https://github.com/5app/base5-ui/commit/5af3b6e226e686e79726cea2f43e1a1f3f448d97))

## [10.1.2](https://github.com/5app/base5-ui/compare/v10.1.1...v10.1.2) (2020-06-16)


Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "base5-ui",
"version": "10.1.2",
"version": "10.2.0",
"description": "5app's reusable UI component library",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -38,8 +38,8 @@
"@babel/plugin-proposal-optional-chaining": "^7.8.3",
"@babel/plugin-transform-react-jsx": "^7.8.3",
"@babel/preset-env": "^7.8.6",
"@commitlint/cli": "^8.2.0",
"@commitlint/config-conventional": "^8.2.0",
"@commitlint/cli": "^9.0.0",
"@commitlint/config-conventional": "^9.0.0",
"@semantic-release/changelog": "^5.0.0",
"@semantic-release/git": "^9.0.0",
"@testing-library/react": "^10.0.0",
Expand Down

0 comments on commit 78bceb3

Please sign in to comment.