{"push_id":1018920174,"size":5,"distinct_size":0,"ref":"refs/heads/feature/揭小强","head":"d553f3fa75acb1664867f8f6cf7a0f34aa208ace","before":"d6a22bd08fda5e4423e36c9f7cf969f2385b5129","commits":[{"sha":"3419a6f6864627f458736b80c0943d098a2b9e45","author":{"email":"1038db7f6254f49e79ff99a72c183ebb50a948ce@qq.com","name":"RongHongButterfly"},"message":"登录注册页面","distinct":false,"url":"https://api.github.com/repos/coolxiao/FootPrintApp/commits/3419a6f6864627f458736b80c0943d098a2b9e45"},{"sha":"d0bee9fcd4ae2ba953955edb55221a702a0bd7a0","author":{"email":"1038db7f6254f49e79ff99a72c183ebb50a948ce@qq.com","name":"RongHongButterfly"},"message":"解决冲突","distinct":false,"url":"https://api.github.com/repos/coolxiao/FootPrintApp/commits/d0bee9fcd4ae2ba953955edb55221a702a0bd7a0"},{"sha":"1d8e98607cfa7d3d2eda5f53ede5ce91e3ef7c76","author":{"email":"47693b470748761a67d35b14c085de2afd85a0f6@sina.com","name":"coolxiao"},"message":"xiaoqiang","distinct":false,"url":"https://api.github.com/repos/coolxiao/FootPrintApp/commits/1d8e98607cfa7d3d2eda5f53ede5ce91e3ef7c76"},{"sha":"859eb9a0eeb4d1a588d89fd87c65ef91bf3e846d","author":{"email":"47693b470748761a67d35b14c085de2afd85a0f6@sina.com","name":"coolxiao"},"message":"Merge branch 'develop' of https://github.com/coolxiao/FootPrintApp into develop\n\nConflicts:\n\tAndroidManifest.xml\n\tbin/classes/com/footprintapp/activity/PersonalActivity.class\n\tbin/classes/com/footprintapp/activity/R$drawable.class\n\tbin/classes/com/footprintapp/activity/R$id.class\n\tbin/classes/com/footprintapp/activity/R$layout.class\n\tbin/classes/com/footprintapp/activity/R$menu.class\n\tbin/classes/com/footprintapp/activity/R$string.class\n\tbin/classes/com/footprintapp/activity/R$style.class\n\tbin/classes/com/footprintapp/custom/MyBaseAdapter.class\n\tbin/classes/com/footprintapp/model/MyDialog.class\n\tgen/com/footprintapp/activity/R.java","distinct":false,"url":"https://api.github.com/repos/coolxiao/FootPrintApp/commits/859eb9a0eeb4d1a588d89fd87c65ef91bf3e846d"},{"sha":"d553f3fa75acb1664867f8f6cf7a0f34aa208ace","author":{"email":"47693b470748761a67d35b14c085de2afd85a0f6@sina.com","name":"coolxiao"},"message":"解决冲突","distinct":false,"url":"https://api.github.com/repos/coolxiao/FootPrintApp/commits/d553f3fa75acb1664867f8f6cf7a0f34aa208ace"}]}