Merge tag 'v1.0.8' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 23 Nov 2015 18:12:12 +0000 (13:12 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 23 Nov 2015 18:12:12 +0000 (13:12 -0500)
commitdc868261eda7db48fb113a4ad54941df7b22f940
tree0211dcdfec1c4a29cf994ce226319cf65f51f444
parent45ea1780411d45aa56019aed1733caa8fd013ffd
parent5e1eb6c42cea84f5a3f6a31b8c6cac6434d863b3
Merge tag 'v1.0.8' into develop

v1.0.8

Conflicts:
css/app.css
css/app.css