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

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

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

..

utils

Merge branch 'master' into 'find'

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

botsettings.py

is_owner() temp patch

2019-01-08 13:52:08 +01:00

cogs.py

Test musicbot

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

misc.py

is_DJ() check implemented. Removed clutter from misc.

2019-01-10 17:22:36 +01:00

music.py

Merge branch 'master' into 'find'

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