Merge branch 'master' into production

lja1018 · lja1018 · commit 0151696a9fbe · 2020-11-16T17:40:18.000+09:00
# Conflicts:
#	.gitignore
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ node_modules
 .DS_Store
 Thumbs.db
 Desktop.ini
+.idea
+storybook-static
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@toast-ui/react-image-editor",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "React wrapper component for tui.imageEditor",
   "main": "dist/toastui-react-image-editor.js",
   "files": [
@@ -54,6 +54,6 @@
   },
   "dependencies": {
     "fabric": "3.6.0",
-    "tui-image-editor": "^3.8.0"
+    "tui-image-editor": "^3.10.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@toast-ui/react-image-editor",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.2.1",`
`4`	`4`	`"description": "React wrapper component for tui.imageEditor",`
`5`	`5`	`"main": "dist/toastui-react-image-editor.js",`
`6`	`6`	`"files": [`
`@@ -54,6 +54,6 @@`
`54`	`54`	`},`
`55`	`55`	`"dependencies": {`
`56`	`56`	`"fabric": "3.6.0",`
`57`		`- "tui-image-editor": "^3.8.0"`
	`57`	`+ "tui-image-editor": "^3.10.1"`
`58`	`58`	`}`
`59`	`59`	`}`