This repository has been archived on 2021-12-05. You can view files and clone it, but cannot push or open issues or pull requests.
envoy/client/src/main/java/envoy/client
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
..
data Merge branch 'develop' into f/logout 2020-09-27 15:27:11 +02:00
event Merge branch 'develop' into f/logout 2020-09-27 15:27:11 +02:00
helper Applied suggestions from @kske 2020-09-26 21:38:31 +02:00
net Merge branch 'develop' into f/logout 2020-09-27 15:27:11 +02:00
ui Merge branch 'develop' into f/logout 2020-09-27 15:27:11 +02:00
util Remove message and event processors from client 2020-09-25 15:28:14 +02:00
Main.java Remove Javadoc header from all source files 2020-09-25 14:29:23 +02:00