Merge branch 'hotfix/1.2.30' v1.2.30
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Jul 2018 16:40:58 +0000 (12:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Jul 2018 16:40:58 +0000 (12:40 -0400)
commit3f385e705c635f36568b7fde3e4f661ebf95fc74
treedf10f585d70bc1f3dabfb7a54c3a12793ad78529
parentc6e8d01998b0368d1732e58e5efbdd33599bafd0
parent8dc315537f7e1c5c0953462a66965a65c0285afb
Merge branch 'hotfix/1.2.30'