Merge tag 'v1.0.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Jan 2017 21:22:29 +0000 (16:22 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Jan 2017 21:22:29 +0000 (16:22 -0500)
commit11f974e2c246796283b0ab1e4b410a52fa0f5ac1
tree89aa59b7236286b9e8e2ea345bc26b9c11a234a2
parent62234de47c6884cc0a84d18fd34f8171d8c54543
parent276288b64417b0746a36338ec13541827c920df2
Merge tag 'v1.0.25' into develop

v1.0.25