Merge Greg's branch into the master branch #297

Merged
greg6775 merged 14 commits from greg-dev into master 2020-01-03 15:37:09 +01:00
Showing only changes of commit 58a539a789 - Show all commits

View file

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