Merge branch 'hotfix/1.0.19' master
authorIan Weller <ian@gaslightmedia.com>
Mon, 28 Nov 2016 16:00:21 +0000 (11:00 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 28 Nov 2016 16:00:21 +0000 (11:00 -0500)
commit488f8b305ad4471c942a88677ba1f5fab7244905
treee6c6b8b5db9d565b07fb2dac5465a82479f285cc
parentfc727370ee905d65fd255f50fa29add54719d586
parent221e8464c1c58a6f69e59db6bbca48e701e642f9
Merge branch 'hotfix/1.0.19'