Sebastian Stenzel ab82874013 Merge branch 'develop' into openjdk11 ...

# Conflicts:
#	main/pom.xml

2019-02-14 18:12:10 +01:00

..

src

reverted change from previous commit

2019-02-12 14:13:45 +01:00

pom.xml

Merge branch 'develop' into openjdk11

2019-01-09 16:07:47 +01:00