Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 18 May 2017 13:45:32 +0000 (09:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 18 May 2017 13:45:32 +0000 (09:45 -0400)
commitb41b9b8e543711fcdd216097ce6d9d5cc7e3f517
tree6604d23f1436417877d80f182973a990db8480de
parent8d169a2177f923715fddc637f9efc3ad38d27f4d
parentcdd55ff062a54e9da3a5cc2f3a68c232c63b0ac9
Merge branch 'hotfix/1.0.5'