Merge branch 'hotfix/1.2.12'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 20:16:49 +0000 (16:16 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 20:16:49 +0000 (16:16 -0400)
commitdebf5edcaa57ac2a276ecc12935f1f5cc094af87
tree8fa9d399117375da6bda2a4c01555295d9214560
parent2849f3f0764c42920cf4cc5c3229d74ed95d87ce
parentb09aceb8dbd3543e5ea43fc5ac57588092da8fe3
Merge branch 'hotfix/1.2.12'