Merge branch 'hotfix/1.0.25'
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 1 Nov 2016 18:56:15 +0000 (14:56 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 1 Nov 2016 18:56:15 +0000 (14:56 -0400)
commit013b30da4917aa525fcd117f9a952edad801828a
tree37f6b979fb3cd206d4ec5b9686d63f820e56a7fb
parentd99e7373988822d1f16e1587807e62b1f2a32063
parenta162f765a32bf0d5455e3c9e965f0c3dc8f69299
Merge branch 'hotfix/1.0.25'