Merge branch 'hotfix/1.1.5' master v1.1.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 27 Jun 2017 15:23:14 +0000 (11:23 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 27 Jun 2017 15:23:14 +0000 (11:23 -0400)
commit03feeb6e317f87f67457474bdc7aa211add83843
tree523995f9421f7f4c49170a8b811abe13d31defe9
parentfbe056466feec0eaa6f931ff2da35f07e14eec76
parent0578f74908f9a14965c665a0e41b4eace91476ca
Merge branch 'hotfix/1.1.5'