Merge Greg's branch into the master branch #282

Merged
greg6775 merged 12 commits from greg-dev into master 2019-12-30 19:30:32 +01:00
Showing only changes of commit 3311bcd428 - Show all commits

View file

@ -36,11 +36,6 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.8.6</version> <version>2.8.6</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>