Commit 6597f289 authored by Lars Mitsem Selbekk's avatar Lars Mitsem Selbekk
Browse files

Merge branch 'i43/battle-view-and-controller' into 'master'

Add BattleView

Closes #43

See merge request !59
parents 55366de4 c36d9987
Pipeline #175802 canceled with stages
in 2 minutes and 8 seconds