Merge branch 'hotfix/1.0.1' master v1.0.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 18 Jan 2017 15:40:43 +0000 (10:40 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 18 Jan 2017 15:40:43 +0000 (10:40 -0500)
commitc1049ddc0f00ebe2471643c58f1b81dd3368f868
tree89c15f413774f6fbee37ddf6a29cfe986ea4d46e
parent722fe6c79cd05ef1b3530b28dcaa7660a06d0db2
parent7df3926843b7f8ac2093de1014403fe2deebb97e
Merge branch 'hotfix/1.0.1'