{"push_id":705406169,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"2a2cd69517f84270ef92cbd4d3c0267d67f10979","before":"47089e6d797a40f93828633e815988552c792333","commits":[{"sha":"98fa0dda765a8c7254c09435578aea386ddb366f","author":{"email":"59d2ab88f83edf7cc67cebd352d75e618e7d2e42@qq.com","name":"tomkluas"},"message":"首页、位置页面调整","distinct":true,"url":"https://api.github.com/repos/MemedaTeam/cn.memeda.weixinapp/commits/98fa0dda765a8c7254c09435578aea386ddb366f"},{"sha":"2a2cd69517f84270ef92cbd4d3c0267d67f10979","author":{"email":"59d2ab88f83edf7cc67cebd352d75e618e7d2e42@qq.com","name":"tomkluas"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tMemeda_Sln/Cn.Memeda.WeixinApp/Cn.Memeda.WeixinApp.csproj\n\tMemeda_Sln/Cn.Memeda.WeixinApp/Cn.Memeda.WeixinApp.csproj.user\n\tMemeda_Sln/Cn.Memeda.WeixinApp/Content/public.css\n\tMemeda_Sln/Cn.Memeda.WeixinApp/obj/Debug/Cn.Memeda.WeixinApp.dll\n\tMemeda_Sln/Cn.Memeda.WeixinApp/obj/Debug/Cn.Memeda.WeixinApp.pdb\n\tMemeda_Sln/Cn.Memeda.WeixinApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n\tMemeda_Sln/Memeda_Sln.v12.suo","distinct":true,"url":"https://api.github.com/repos/MemedaTeam/cn.memeda.weixinapp/commits/2a2cd69517f84270ef92cbd4d3c0267d67f10979"}]}