Roxedus d4b5c6f686 Merge branch 'master' into 'find' ...

# Conflicts:
#   bot.py
#   cogs/music.py

2019-01-10 19:26:11 +00:00

..

mixplayer

Removed shuffle, added missing EOF newlines

2019-01-10 17:39:14 +01:00

checks.py

Removed shuffle, added missing EOF newlines

2019-01-10 17:39:14 +01:00

RoxUtils.py

What. The. Fuck

2019-01-10 18:27:38 +01:00

settings.py

Test musicbot

2019-01-07 22:13:10 +01:00