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
Kai S. K. Engelbart db28f02505
Merge branch 'develop' into f/enhanced-status-tray-icon
Conflicts:
	client/src/main/java/envoy/client/data/Chat.java
	client/src/main/java/envoy/client/ui/StatusTrayIcon.java
2020-10-19 18:36:07 +02:00
..
client Merge branch 'develop' into f/enhanced-status-tray-icon 2020-10-19 18:36:07 +02:00