{"push_id":1054750997,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"82ea9ce826b58dcca1052339b0cec07c74d4a1ed","before":"eea6380babce1f2c3b9d487625c1b63ead423b6f","commits":[{"sha":"3c78d7c2644dcfef8a51a5092a90388117567adc","author":{"email":"b29faa0cb693a0135586bf614c9c3c24aba50dff@qq.com","name":"zhuzhige"},"message":"update","distinct":true,"url":"https://api.github.com/repos/zhuzhige/DouyuDG/commits/3c78d7c2644dcfef8a51a5092a90388117567adc"},{"sha":"82ea9ce826b58dcca1052339b0cec07c74d4a1ed","author":{"email":"b29faa0cb693a0135586bf614c9c3c24aba50dff@qq.com","name":"zhuzhige"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\tDGCars/DGCars.xcodeproj/project.pbxproj\n#\tDGCars/Podfile\n#\tDGCars/Podfile.lock\n#\tDGCars/Pods/Manifest.lock\n#\tDGCars/Pods/Pods.xcodeproj/project.pbxproj\n#\tDGCars/Pods/Target Support\nFiles/CocoaAsyncSocket/CocoaAsyncSocket.xcconfig\n#\tDGCars/Pods/Target Support\nFiles/Pods-DGCars/Pods-DGCars-acknowledgements.markdown\n#\tDGCars/Pods/Target Support\nFiles/Pods-DGCars/Pods-DGCars-acknowledgements.plist\n#\tDGCars/Pods/Target Support Files/Pods-DGCars/Pods-DGCars-resources.sh\n#\tDGCars/Pods/Target Support\nFiles/Pods-DGCars/Pods-DGCars.debug.xcconfig\n#\tDGCars/Pods/Target Support\nFiles/Pods-DGCars/Pods-DGCars.release.xcconfig","distinct":true,"url":"https://api.github.com/repos/zhuzhige/DouyuDG/commits/82ea9ce826b58dcca1052339b0cec07c74d4a1ed"}]}