Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cogs/help.py
This commit is contained in:
Matthias Nadler 2019-06-29 20:31:50 +02:00
commit 0e6a797d46

View File

@ -260,7 +260,7 @@ class Help(commands.Cog):
# @mention and @debug commands # @mention and @debug commands
@commands.Cog.listener() @commands.Cog.listener()
async def on_message(self, message): async def on_message(self, message):
if message.author == self.bot.owner: if message.author == self.bot.user:
return return
if message.content.startswith("@mention"): if message.content.startswith("@mention"):