Skip to content

Commit e6422a5

Browse files
committed
Merge remote-tracking branch 'origin/develop' into EPMUII-8769-Drang-n-drop-fixing
2 parents e2e6fee + ca7b2f8 commit e6422a5

24 files changed

+421
-2035
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"daikon": "^1.2.42",
4040
"jszip": "^3.10.1",
4141
"react": "^17.0.2",
42+
"react-color": "^2.19.3",
4243
"react-dnd": "^14.0.2",
4344
"react-dnd-html5-backend": "^14.0.0",
4445
"react-dom": "^17.0.2",

public/sprite.svg

Lines changed: 9 additions & 1 deletion
Loading

0 commit comments

Comments
 (0)