Sandro La Bruzzo c73072079d fix conflicts		2021-03-22 16:36:31 +01:00
..
dhp	fix conflicts	2021-03-22 16:36:31 +01:00
scholexplorer/relation	switched automatic code formatting plugin to net.revelc.code.formatter:formatter-maven-plugin	2020-04-27 14:52:31 +02:00