Merge branch 'master' into development

ocadotechnology · Dec 21, 2018 · 03ed8e3 · 03ed8e3
2 parents 1ce268c + d78e5d2
commit 03ed8e3
Show file tree

Hide file tree

Showing 3 changed files with 203 additions and 223 deletions.
diff --git a/aimmo/admin.py b/aimmo/admin.py
@@ -21,6 +21,5 @@ def owner_name(self, obj):
     def game_name(self, obj):
         return obj.game
 
-
 admin.site.register(Game, GameDataAdmin)
 admin.site.register(Avatar, AvatarDataAdmin)