Merge branch 'hotfix/1.1.2' v1.1.2
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 7 Aug 2017 18:07:19 +0000 (14:07 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 7 Aug 2017 18:07:19 +0000 (14:07 -0400)
commit629b0e702508d09dd718bb51914152e651e8208b
tree0ca1029648a81e4c237bad7e08e404593a8c46de
parent1cf8b0846836db42a8ab48a03f4bf34d805a36bb
parentba4de11278e1e3aedb5d46c638e0a9d9922fec23
Merge branch 'hotfix/1.1.2'