Merge branch 'hotfix/1.2.4'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:19:02 +0000 (13:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:19:02 +0000 (13:19 -0400)
commitb9a71225e03f5113658b389bb9be9323f3d4357f
treed60117a4a3fd5f8f445014db6530d91c710a9a5d
parentbdcb2be340df2da7cec643bc1a7763717c66a10f
parent04b6b5d3081947d97850a6a4c96fdabe5f164dad
Merge branch 'hotfix/1.2.4'