Merge branch '5074-did-get-response-details-resource-type' of https://github.com...
authorCheng Zhao <zcbenz@gmail.com>
Mon, 11 Apr 2016 12:05:40 +0000 (21:05 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 11 Apr 2016 12:05:40 +0000 (21:05 +0900)
commita07612c1eda9452a3c0e659db479fae7f7773d4d
tree4fc0af3b8d1a5f659eeab16f2d52eb22e1da73e6
parenta2f7458e078dc0d28ea2c19499fac37e62063db6
parent1a842bf9d50b8a424bcd7a29183c2b795fbb656b
Merge branch '5074-did-get-response-details-resource-type' of https://github.com/Mr0grog/electron into Mr0grog-5074-did-get-response-details-resource-type
atom/browser/net/atom_network_delegate.cc