Merge branch 'develop' into refresh

Conflicts:
	core/config.py
	plugins/util/color.py
	plugins/util/formatting.py
This commit is contained in:
Luke Rogers 2013-11-27 16:55:04 +13:00
commit aa8ab33ccb
31 changed files with 113 additions and 86 deletions

View file

@ -48,4 +48,4 @@ class TextGenerator(object):
return strings
def get_template(self, template):
return self.templates[template]
return self.templates[template]