Merge branch 'hotfix/1.0.5' 1.0.5
authorIan Weller <ian@gaslightmedia.com>
Fri, 17 Mar 2017 20:27:43 +0000 (16:27 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 17 Mar 2017 20:27:43 +0000 (16:27 -0400)
commitbf1710090dae2629b0c91e23f0b86c1c3d5b323f
tree9c8ef54a2f56c7fb3cf89a01d021419cc11d8386
parent96b9895c7195d3d020763d8e9ce7a84637637eef
parent74a8f40323a71b6fbfbdb8a861194ba62f635d1d
Merge branch 'hotfix/1.0.5'