Merge tag 'v1.2.21' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 24 Mar 2017 20:40:29 +0000 (16:40 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 24 Mar 2017 20:40:29 +0000 (16:40 -0400)
commit40a0d8f6bff331b6ab8c25754322a4ef639944b6
treeeef71a37fa56fb2a2998fc8e1913e722bd7db6a2
parent80a7de3a0e177f4e4cf6542cd653529c31032c04
parent30b76125ec386cb0ed93c9cdf6bc1aebd2495759
Merge tag 'v1.2.21' into develop

version 1.2.21