Merge branch 'hotfix/1.0.4' master v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Sep 2017 19:41:11 +0000 (15:41 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Sep 2017 19:41:11 +0000 (15:41 -0400)
commit517dd77cd9d0d753761722a705ef7f46bc498b47
tree122896c0a54224ca9e4a8058fa6caf521134f616
parent729c0eb64ff8908aaf65747b768ce744407f264c
parent7c1c1b1fb48a055b230c7c9891b728ef05af10d5
Merge branch 'hotfix/1.0.4'