Merge with master

2021-05-26 19:01:21 +03:00 · 2021-05-26 19:01:21 +03:00 · 9d8a1f0dc5
commit 9d8a1f0dc5
parent 15d725570d
1 changed files with 2 additions and 1 deletions
--- a/application/src/test/resources/application-test.properties
+++ b/application/src/test/resources/application-test.properties
@ -1,2 +1,3 @@
 transport.lwm2m.security.key_store=lwm2m/credentials/serverKeyStore.jks
-transport.lwm2m.security.key_store_password=server
+transport.lwm2m.security.key_store_password=server
+edges.enabled=true