Merge branch 'hotfix/1.1.29' v1.1.29
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Oct 2017 17:30:21 +0000 (13:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Oct 2017 17:30:21 +0000 (13:30 -0400)
commit61775591a7f6294120832fb85ccabc3ecf73832c
tree7e7f0285cb19c7f4cf2f5c46a665b74ef1de2bb7
parent2985e54eacec19e392f3b2b692ff2d6e4ba3e12e
parentfc66dd9f77caf2ee079fad483295a84d90412274
Merge branch 'hotfix/1.1.29'