{"push_id":1462964657,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"cff76d508bd4d83590958d083ea5e8aecea04e63","before":"944b70aaf990b099c52eee6a86ee489b3b72b8ee","commits":[{"sha":"2de41c2d749137c2eaa562bb38e7addca9c43d54","author":{"name":"shawei","email":"926f463946a5632b2f3e3e458675327b55a01383@qq.com"},"message":"沙伟12/19","distinct":true,"url":"https://api.github.com/repos/EmbraceU/Academicheadlines/commits/2de41c2d749137c2eaa562bb38e7addca9c43d54"},{"sha":"cff76d508bd4d83590958d083ea5e8aecea04e63","author":{"name":"shawei","email":"926f463946a5632b2f3e3e458675327b55a01383@qq.com"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\tapp/src/main/AndroidManifest.xml\n\n#\tapp/src/main/java/com/example/admin/academicheadlines/search/SearchActivity.java\n\n#\tapp/src/main/java/com/example/admin/academicheadlines/subscribe/SubscribeActivity.java\n\n#\tapp/src/main/java/com/example/admin/academicheadlines/subscribe/SubscribeDetailActivity.java\n\n#\tapp/src/main/java/com/example/admin/academicheadlines/user/LoginActivity.java\n\n#\tapp/src/main/java/com/example/admin/academicheadlines/user/NoticeActivity.java\n\n#\tapp/src/main/java/com/example/admin/academicheadlines/user/UserActivity.java\n#\tapp/src/main/res/layout/activity_notice.xml\n#\tapp/src/main/res/layout/activity_search.xml\n#\tapp/src/main/res/layout/activity_user.xml","distinct":true,"url":"https://api.github.com/repos/EmbraceU/Academicheadlines/commits/cff76d508bd4d83590958d083ea5e8aecea04e63"}]}
{"actor":{"display_login":"EmbraceU"}}