Merge branch 'develop' into f/new_ui

Conflicts: client/src/main/java/envoy/client/ui/controller/LoginScene.java
2020-07-18 10:49:24 +02:00
parent b1fbad059e 86abbebe68
commit 0a4baad5a2
40 changed files with 323 additions and 328 deletions
--- a/client/src/main/resources/client.properties
+++ b/client/src/main/resources/client.properties
@ -1,3 +1,4 @@
 server=localhost
 port=8080
-localDB=.\\localDB
+localDB=localDB
+consoleLevelBarrier=FINER