P0nk b8781ee209 Merge branch 'master' into fix-tools ...

# Conflicts:
#	pom.xml

2021-07-11 14:53:11 +02:00

..

java

Merge branch 'master' into fix-tools

2021-07-11 14:53:11 +02:00

resources

Set up Slf4j and Log4j2 for logging

2021-04-07 18:40:46 +02:00