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
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
..
.settings Reduce wildcard import threshold to 2 2020-09-02 10:32:44 +02:00
src/main Merge branch 'develop' into f/logout 2020-09-27 15:27:11 +02:00
.classpath Added option to autocreate bug issues on client and server side 2020-08-16 17:14:41 +02:00
.project Fixed sudden Eclipse annoyance 2020-09-21 18:49:58 +02:00
pom.xml Speed up build, move compiler configuration to parent POM 2020-07-18 13:32:49 +02:00