Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Jan 2017 15:52:34 +0000 (10:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Jan 2017 15:52:34 +0000 (10:52 -0500)
commit577c4f0d919376c55fa3f2e1a6f42a0e5bd90b3d
tree900dc215a8ac465b4dc732f67a53404d1f522b31
parentcb06181dba53f4055524e0c8aa7de913bb6da70f
parent1358fd8fb8d8d0cfe1879dba7dc1857ec438fa3f
Merge branch 'hotfix/1.0.5'