Merge from develop
This commit is contained in:
commit
40c68f8f08
|
@ -43,7 +43,7 @@
|
||||||
"rxjs": "^6.5.1",
|
"rxjs": "^6.5.1",
|
||||||
"ts-md5": "^1.2.0",
|
"ts-md5": "^1.2.0",
|
||||||
"tslib": "^2.0.0",
|
"tslib": "^2.0.0",
|
||||||
"uikit": "3.12.2",
|
"uikit": "3.13.0",
|
||||||
"zone.js": "~0.11.4"
|
"zone.js": "~0.11.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit a49970aca66cf98a2ee9cd767e8dc87badc0b80f
|
Subproject commit f00607f8d308e856d66da8b905d3221361952874
|
Loading…
Reference in New Issue