Merge branch 'main' into revert-changes-to-button-v11

carbon-design-system · Jan 26, 2022 · e79b81e · e79b81e
2 parents 075819e + c5bb06f
commit e79b81e
Show file tree

Hide file tree

Showing 46 changed files with 2,935 additions and 1,706 deletions.
diff --git a/.yarn/cache/bluebird-npm-3.1.5-c044543786-532596038c.zip b/.yarn/cache/bluebird-npm-3.1.5-c044543786-532596038c.zip
diff --git a/config/eslint-config-carbon/package.json b/config/eslint-config-carbon/package.json
@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-carbon",
   "description": "ESLint configuration for Carbon",
-  "version": "2.9.0",
+  "version": "2.10.0-rc.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

diff --git a/config/jest-config-carbon/package.json b/config/jest-config-carbon/package.json
@@ -2,7 +2,7 @@
   "name": "jest-config-carbon",
   "private": true,
   "description": "Jest configuration and preset for Carbon",
-  "version": "0.11.0",
+  "version": "0.12.0-rc.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

diff --git a/docs/migration/11.x-carbon-components-react.md b/docs/migration/11.x-carbon-components-react.md
diff --git a/docs/migration/11.x-carbon-components.md b/docs/migration/11.x-carbon-components.md
diff --git a/docs/migration/11.x-carbon-icons-react.md b/docs/migration/11.x-carbon-icons-react.md