Merge Greg's branch into the master branch #257

Merged

greg6775 merged 3 commits from greg-dev into master

2019-12-26 22:42:43 +01:00

Author	SHA1	Message	Date
GregTCLTK	4d5b830a13	Language fix	2019-12-26 22:42:17 +01:00
Skidder	313c0c36c5	Merge pull request #255 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_86 Bump JDA from 4.1.0_84 to 4.1.0_86	2019-12-26 22:39:47 +01:00
dependabot-preview[bot]	6ad176f789	Bump JDA from 4.1.0_84 to 4.1.0_86 Bumps JDA from 4.1.0_84 to 4.1.0_86. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-26 13:48:17 +00:00