{"push_id":1057113337,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"133b215b1a8e54c0fcbad5e56521f0d79b6e6b19","before":"458c37c4d22c1617edc991cf2622c91f0de28cbf","commits":[{"sha":"679e3642ad10c1fd6fc1fb994db3fc7fee3a41c8","author":{"email":"dbb9fff69b28bf31407e02fce9e4eb779571c909@qq.com","name":"Tryking"},"message":"删除了环信等集成","distinct":true,"url":"https://api.github.com/repos/Tryking/Tryking/commits/679e3642ad10c1fd6fc1fb994db3fc7fee3a41c8"},{"sha":"133b215b1a8e54c0fcbad5e56521f0d79b6e6b19","author":{"email":"dbb9fff69b28bf31407e02fce9e4eb779571c909@qq.com","name":"Tryking"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\t.idea/gradle.xml\n#\t.idea/misc.xml\n#\t.idea/modules.xml\n#\tapp/build.gradle\n#\tapp/src/main/AndroidManifest.xml\n#\tapp/src/main/java/com/example/tryking/trykingchat/base/BaseActivity.java\n#\tapp/src/main/java/com/example/tryking/trykingchat/base/TrykingChatApplication.java\n#\tapp/src/main/java/com/example/tryking/trykingchat/chat/LoginActivity.java\n#\tapp/src/main/java/com/example/tryking/trykingchat/chat/RegisterActivity.java\n#\tapp/src/main/java/com/example/tryking/trykingchat/main/EntranceActivity.java\n#\tapp/src/main/res/layout/activity_login.xml\n#\tapp/src/main/res/layout/activity_register.xml\n#\tapp/src/main/res/values/strings.xml\n#\tsettings.gradle","distinct":true,"url":"https://api.github.com/repos/Tryking/Tryking/commits/133b215b1a8e54c0fcbad5e56521f0d79b6e6b19"}]}