Merge branch 'hotfix/1.1.6' v1.1.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Nov 2016 15:05:55 +0000 (11:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Nov 2016 15:05:55 +0000 (11:05 -0400)
commitd8d356daec80368217798f31092842bfe819d1c3
tree2e005d1350cad1379168050fcd69d22cf4f9cc82
parent47922f0c4e89a628dec4c9c61c8d8b4038ea1834
parent9c6ad589758cd9a8a2da8c6868e54b3a83d998fb
Merge branch 'hotfix/1.1.6'