Merge branch 'hotfix/1.0.20' v1.0.20
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Dec 2017 15:58:49 +0000 (10:58 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Dec 2017 15:58:49 +0000 (10:58 -0500)
commit72a30d6c276706bf50bf11a5d410416d7f1cbfc0
tree1df9ba4d0a1444f8854961612140793e14312e83
parent84b9b79e1b01a708389d03ca6c3c6ec176012178
parentde65751e4fde52a715a5a5879d93964c588e6791
Merge branch 'hotfix/1.0.20'