Merge branch 'martin-t/dmgtext' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 6 May 2017 20:32:17 +0000 (20:32 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 6 May 2017 20:32:17 +0000 (20:32 +0000)
commitc5b2732b2c36867791ee04aa76de6c766a52a039
tree401d7474f8413fd8a8386e60a4beab4d7e425333
parent907f3aacb38cd5d3bb8ad66e3799bdf2627e5f53
parent8b389a772be8252aff45407c84eb09c656669ccf
Merge branch 'martin-t/dmgtext' into 'master'

Split damagetext into server/client/ui

See merge request !438