Merge branch 'hotfix/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Jan 2017 21:22:23 +0000 (16:22 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Jan 2017 21:22:23 +0000 (16:22 -0500)
commit276288b64417b0746a36338ec13541827c920df2
tree89aa59b7236286b9e8e2ea345bc26b9c11a234a2
parent7a05ce6bbd24b3df5e7420ffc4e60f6e3649965e
parent823648eb18918406e1b9bf68d93d6b6b8c64b3a8
Merge branch 'hotfix/1.0.25'