P0nk 442684d852 Merge branch 'master' into netty ...

# Conflicts:
#	pom.xml

2021-06-21 22:15:00 +02:00

..

java

Merge branch 'master' into netty

2021-06-21 22:15:00 +02:00

resources

Set up Slf4j and Log4j2 for logging

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