Merge branch 'hotfix/1.0.20'
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 12:54:48 +0000 (08:54 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 12:54:48 +0000 (08:54 -0400)
commit11d11ea4cc2444eed66fa1829b60889699272950
treeec6d5b88deec0b94c93b828a2cdcd3afd640512b
parent53fe73ee03b89dc0b218c120e2415e73979d04d1
parent60fc3f0aeac94e830995dc5f5f0d8269306d5f6e
Merge branch 'hotfix/1.0.20'