Merge branch 'hotfix/1.1.5' v1.1.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 22 May 2018 17:58:10 +0000 (13:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 22 May 2018 17:58:10 +0000 (13:58 -0400)
commit29b86e8df8480c79f607f3f8f7deffc9ceabc8da
tree3a37bf16be9e580e2168b60f26d8bfd0dbd11dc4
parent1f116cafce6e42dc868086a787bf7a662d36fd29
parent324494ba6e68c636c2a560ddfdd29916d7fe8974
Merge branch 'hotfix/1.1.5'