Merge branch 'hotfix/1.2.9' v1.2.9
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 20:28:33 +0000 (15:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 20:28:33 +0000 (15:28 -0500)
commitf17a524d94256bdfe33e666b9a1638ba4e916d8e
tree987b599c382b96ccfc0d0cf3a0fd4d14dcff8512
parent750fd251adb492db1dc39259352f4d230f185068
parentdc522534d7a8135420ec634014ebd38ccb0be3b7
Merge branch 'hotfix/1.2.9'