fix specs, fix merge conflicts and cleanup

This commit is contained in:
Sergio Crisostomo 2018-01-22 14:23:05 +01:00
parent d9ff845f63
commit 5426dcf989
8 changed files with 36 additions and 17 deletions

View file

@ -43,6 +43,7 @@
"async-validator": "^1.8.2",
"deepmerge": "^1.5.2",
"element-resize-detector": "^1.1.13",
"js-calendar": "^1.2.3",
"lodash.throttle": "^4.1.1",
"popper.js": "^0.6.4",
"tinycolor2": "^1.4.1"