Sebastian c980814592 Merge branch 'master' of https://git.cliffbreak.de/Cockpit/BPMN_Projekt ... # Conflicts: # Rechnungseingang/target/m2e-wtp/web-resources/META-INF/maven/com.bpmn/Rechnungseingang/pom.properties		2020-05-27 15:03:35 +02:00
..
web-resources	Merge branch 'master' of https://git.cliffbreak.de/Cockpit/BPMN_Projekt	2020-05-27 15:03:35 +02:00