Merge origin/master

Conflicts:
	pom.xml
This commit is contained in:
John Grosh 2020-01-28 21:02:36 -05:00
commit baa3a60b05

View file

@ -22,9 +22,8 @@ A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Version Info (please complete the following information):**
- Operating System: [e.g. Windows 64bit]
- JMusicBot Version: [e.g. 0.2.1]
**Debug Info**
Please run the `debug` command and paste it here or upload it as an attachment. If you cannot run the command, please provide information about your system such as operating system version, JMusicBot version, etc.
**Additional context**
Add any other context about the problem here.