ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into refresh

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

3
plugins/slap.py
View file

@ -1,6 +1,7 @@
from util import hook, textgen
import json
from util import hook, textgen
def get_generator(_json, variables):
data = json.loads(_json)