Miriam Baglioni f7695e833c resolved conflicts		2020-04-29 11:41:31 +02:00
..
worker/model	switched automatic code formatting plugin to net.revelc.code.formatter:formatter-maven-plugin	2020-04-27 14:52:31 +02:00