Alexander Söderberg 4d24112ec7 Fix merge issues

2020-07-17 23:06:40 +02:00

..

src/main

Fix merge issues

2020-07-17 23:06:40 +02:00

build.gradle

Merge branch 'v6' into feature/v6/json

2020-07-14 19:25:14 +02:00

pom.xml

Merge branch 'v6' into feature/v6/platform

2020-07-14 19:05:05 +02:00