Merge branch 'develop' into refresh

Conflicts:
	disabled_stuff/mygengo_translate.py
	plugins/attacks.py
	plugins/core_sieve.py
	plugins/fortune.py
	plugins/geoip.py
	plugins/mark.py
This commit is contained in:
Luke Rogers 2014-02-14 16:41:51 +13:00
commit bf9468a4aa
82 changed files with 530 additions and 380 deletions

View file

@ -1,7 +1,10 @@
from util import hook
import random
from util import hook
with open("./data/fortunes.txt") as f:
fortunes = [line.strip() for line in f.readlines()
if not line.startswith("//")]