Alexander Söderberg b68d7150f1 Manually fix some merge conflicts		2020-07-14 19:34:44 +02:00
..
src/main	Manually fix some merge conflicts	2020-07-14 19:34:44 +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