Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Luke Rogers 2014-04-03 18:27:42 +13:00
commit 40328cf24f
1 changed files with 2 additions and 2 deletions

View File

@ -15,7 +15,7 @@ phrases = [
u"YOU WON'T NOT MAKE SOME FUCKING \x02{}\x02",
u"HOW ABOUT SOME FUCKING \x02{}?\x02",
u"WHY DON'T YOU EAT SOME FUCKING \x02{}?\x02",
u"MAKE SOME FUCKING \x02{}\x02", v
u"MAKE SOME FUCKING \x02{}\x02",
u"INDUCE FOOD COMA WITH SOME FUCKING \x02{}\x02"
]
@ -103,4 +103,4 @@ def dinner(inp):
if censor:
text = text.replace("FUCK", "F**K")
return u"{} - {}".format(text, web.try_isgd(url))
return u"{} - {}".format(text, web.try_isgd(url))