Merge branch 'master' into development

cogs/util.py

@@ -80,6 +80,9 @@ class Util():
 			else:
 				roles += role.name + ", "
 				count += 1
+		if not roles:
+			roles = "None"
+			count = 0
 		embed.add_field(name="Roles [{}]".format(count), value=roles.strip(", "))
 		return await self.bot.say(embed=embed)
 
@@ -187,4 +190,4 @@ class Util():
 
 
 def setup(Bot):
-	Bot.add_cog(Util(Bot))
+	Bot.add_cog(Util(Bot))

config/meta.py

@@ -3,5 +3,5 @@ __description__ = """RoxBot, A Discord Bot made by a filthy Mercy Main. Built wi
 [Github link](https://github.com/RainbowDinoaur/roxbot)
 [Changelog](https://github.com/RainbowDinoaur/roxbot#v100)"""
 __author__ = "Roxanne Gibson"
-__version__= "1.1.1"
+__version__= "1.1.2"
 embedcolour = 0xDEADBF