Commit Graph

2 Commits

Author SHA1 Message Date
Kai S. K. Engelbart d70a848ef3
Merge branch 'develop' into f/logout
Conflicts:
	client/src/main/java/envoy/client/data/CacheMap.java
	client/src/main/java/envoy/client/data/commands/SystemCommandsMap.java
	client/src/main/java/envoy/client/net/Client.java
	client/src/main/java/envoy/client/ui/Startup.java
	client/src/main/java/envoy/client/ui/StatusTrayIcon.java
	client/src/main/java/envoy/client/ui/controller/ChatScene.java
	client/src/main/java/envoy/client/ui/controller/ContactSearchTab.java
2020-09-27 15:27:11 +02:00
Leon Hofmeister 2d9283551a
Improved SystemCommand mechanism, added Alert- and ShutdownHelper, and
... added askForConfirmation option
2020-09-23 17:03:32 +02:00