Merge tag 'v1.0.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 23 Nov 2015 18:06:14 +0000 (13:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 23 Nov 2015 18:06:14 +0000 (13:06 -0500)
commit45ea1780411d45aa56019aed1733caa8fd013ffd
tree4a86da3ecf431852271a1b1c88d9e7fe1c77a6cd
parent307c773b3af58182b82dde0a410765c913a8f044
parent96b9e789b316f9c874e6968436d09c91475d07e9
Merge tag 'v1.0.7' into develop

v1.0.7

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