Merge branch 'hotfix/1.0.20' v1.0.20
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 May 2017 17:07:17 +0000 (13:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 May 2017 17:07:17 +0000 (13:07 -0400)
commit30295c6caa774c15f60ea81ff01d87de9852847d
tree0d3cb7a860124e815adc89e2082864c1d64d38c4
parent1ff066d5fc59f23b71920bcc1938e99ffa84b536
parent06923ae048e848ac5b97f3745cabbd6513a55431
Merge branch 'hotfix/1.0.20'