Merge branch 'hotfix/1.2.30' v1.2.30
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 28 Sep 2017 18:53:20 +0000 (14:53 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 28 Sep 2017 18:53:20 +0000 (14:53 -0400)
commitdb478ab3b50056f54d962d23e684166bf6d5c303
tree7f0440dbfc469e3676dc2d5ccafde9a2fda84909
parent6522abf0a0e4b07e78322f0e07ade7d1a28adc36
parent473d92b1b84787d651038471af6948cde1cdd37e
Merge branch 'hotfix/1.2.30'