Merge branch 'hotfix/1.2.7' v1.2.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Jun 2016 16:37:26 +0000 (12:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Jun 2016 16:37:26 +0000 (12:37 -0400)
commit3fc4dd7bd0c2530bb5c0751ddf80db636e12744d
tree15408a0f83588f90de15406b7a43774c7b3375c3
parent550e77e2f420c9a6710d55d5a549a53897819672
parent6be51470968a681642b9d9def48921337b8ab73d
Merge branch 'hotfix/1.2.7'