Merge branch 'hotfix/1.0.4'
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Jun 2016 19:26:43 +0000 (15:26 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Jun 2016 19:26:43 +0000 (15:26 -0400)
commitd4d358128643288f5a7b204dc237cbaece82b755
treeca0477f0dee0c4ed73f37ebbfb561856e1f630ae
parentcb5293d8fea1e6027bc887116d7f2a45df997081
parent13aa316c0daa0982c6173d4605df8ae1fb5840fd
Merge branch 'hotfix/1.0.4'