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.
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 |
.. |
main
|
Merge branch 'develop' into f/logout
|
2020-09-27 15:27:11 +02:00 |