Merge branch 'hotfix/1.7.9' v1.7.9
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 29 Nov 2018 20:28:21 +0000 (15:28 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 29 Nov 2018 20:28:21 +0000 (15:28 -0500)
commit8436a25c0cf3344a9bb4bf4647962745d826410c
tree799b085e58c8d9ddb120b69a0cb254d7f600274e
parent0bab299f4ac02c7aafdf7cd145fd4d8ae38ded72
parent469a341a61cb3681749feff76c3cb36b877a8c42
Merge branch 'hotfix/1.7.9'