Merge branch 'hotfix/1.2.10'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 30 Sep 2016 20:32:53 +0000 (16:32 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 30 Sep 2016 20:32:53 +0000 (16:32 -0400)
commitf46da89cf9815cb83876296fab54b3b520cecbbb
tree7ce0ba990ee2647628921d1101950df61c126d62
parentbca193147082810103afbf7338b126c8e4eb11a6
parent5addc15fd717189cddd0569b4ea26d20bc87dde3
Merge branch 'hotfix/1.2.10'