Merge branch 'develop' into api-v3

This commit is contained in:
Blade Barringer
2016-03-04 12:16:22 -06:00
55 changed files with 133 additions and 102 deletions

View File

@@ -511,4 +511,4 @@ _.each(spells, (spellClass) => {
});
});
export default spells;
module.exports = spells;