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.

Leon Hofmeister 618a4aa3cf Merge remote-tracking branch 'origin/develop' into f/logout ... Conflicts: client/src/main/java/envoy/client/ui/controller/ContactSearchTab.java		2020-09-25 23:16:25 +02:00
..
client	Merge remote-tracking branch 'origin/develop' into f/logout	2020-09-25 23:16:25 +02:00