Merge remote-tracking branch 'origin/master' into test-3

# Conflicts: # gui/characterEditor.py
2018-02-23 23:28:33 -05:00
parent 96c13c344a cb4fadf84c
commit 73d59569ff
3 changed files with 25 additions and 38 deletions
--- a/service/character.py
+++ b/service/character.py
@@ -253,6 +253,7 @@ class Character(object):

        # revert old char
        char.revertLevels()
+        return newChar.ID

    @staticmethod
    def revertCharacter(charID):