Merge branch 'hotfix/2.1.1' v2.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Feb 2017 13:06:03 +0000 (08:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Feb 2017 13:06:03 +0000 (08:06 -0500)
commita778d475c6bff63adfdf0d68bf72f584ac5f7242
tree523af0545972fae53e8f0ddbf55b63d9b7df54c0
parent0fecca76724f23c0cba385cb5d042765079f85b6
parente71ee766d72124784e885c14a798b5e0f4d16288
Merge branch 'hotfix/2.1.1'