Nanne Baars 35c1305ce9 Merge conflicts resolved

2019-09-23 07:34:27 +02:00

..

src

Merge conflicts resolved

2019-09-23 07:34:27 +02:00

.gitignore

Reloading finished

2015-09-30 19:03:49 +02:00

pom.xml

First attempt at moving to Spring Boot 2

2019-09-12 17:22:03 +02:00