Merge branch 'hotfix/1.1.7' v1.1.7
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 15:07:00 +0000 (11:07 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 15:07:00 +0000 (11:07 -0400)
commit7132bb11f4760330399f0ebe69e69ba90f027c2a
tree123445121eda9490a2e337a7bac31f4333ce125d
parent3a6b783f1da9940ff0f674dc5c5faeb8331ae584
parente7e513218634a70363ab71da52c9da1354e30f08
Merge branch 'hotfix/1.1.7'