Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Jun 2017 15:24:33 +0000 (11:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Jun 2017 15:24:33 +0000 (11:24 -0400)
commitdba0132dd5f662d70315d0e6b494f7fd6619726c
treefd491348a454a163f5b534d59fa30c8c4fef11c8
parentc83a4f6a95079d2885669e0c5c1648aeb05031f3
parented7556d58ab1358762ca311124aaaf8fc29d2b44
Merge branch 'hotfix/1.0.4'