tree dc74426a63e032d8b820b694a2b75b538a549045
parent af5285acf0600908151289f7e94b71b089133fed
parent ab3f89b8d024ad11fede033ee5c12771818a9c58
author Ina Curdt <Ina.Curdt@pta.de> 1579248686 +0100
committer Ina Curdt <Ina.Curdt@pta.de> 1579248686 +0100

conflicts resolved,
merge with KON-18