Merge branch 'develop' into refresh
Conflicts: core/config.py plugins/util/color.py plugins/util/formatting.py
This commit is contained in:
commit
aa8ab33ccb
31 changed files with 113 additions and 86 deletions
|
@ -48,4 +48,4 @@ class TextGenerator(object):
|
|||
return strings
|
||||
|
||||
def get_template(self, template):
|
||||
return self.templates[template]
|
||||
return self.templates[template]
|
||||
|
|
Reference in a new issue