Merge Greg's branch into the master branch #271

Merged
greg6775 merged 21 commits from greg-dev into master 2019-12-28 15:27:06 +01:00
Showing only changes of commit fa957c6ba5 - Show all commits

View file

@ -19,7 +19,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.1.0_86</version>
<version>4.1.0_87</version>
</dependency>
<dependency>
<groupId>org.json</groupId>