{"push_id":652316895,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"99ecd989200d5cfe530b306c6a512254f57050f0","before":"764abe94c223752efe60412054a3b1a7a4c81476","commits":[{"sha":"ac6b48fc0c38efff83479e380a35838c4db2d9da","author":{"email":"82c2266c46910e18a35534a90db0824bba50ab33@126.com","name":"cadyfunny"},"message":"add example","distinct":true,"url":"https://api.github.com/repos/luqizheng/Ornament-Portable-Areas/commits/ac6b48fc0c38efff83479e380a35838c4db2d9da"},{"sha":"2e59a98a832f6a435e5eb2b5b6c20cc4d7db068c","author":{"email":"82c2266c46910e18a35534a90db0824bba50ab33@126.com","name":"cadyfunny"},"message":"加入embed resource","distinct":true,"url":"https://api.github.com/repos/luqizheng/Ornament-Portable-Areas/commits/2e59a98a832f6a435e5eb2b5b6c20cc4d7db068c"},{"sha":"99ecd989200d5cfe530b306c6a512254f57050f0","author":{"email":"82c2266c46910e18a35534a90db0824bba50ab33@126.com","name":"cadyfunny"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tsrc/PortableAreas/MasterWeb/App_Start/RouteConfig.cs\n\tsrc/PortableAreas/MasterWeb/MasterWeb.csproj\n\tsrc/PortableAreas/MasterWeb/Views/Home/Index.cshtml\n\tsrc/PortableAreas/MasterWeb/Web.config\n\tsrc/PortableAreas/MasterWeb/packages.config\n\tsrc/PortableAreas/Ornament.Web.ProtableAreas/ApplicationBus.cs\n\n\tsrc/PortableAreas/Ornament.Web.ProtableAreas/BasePortableAreaRegistration.cs\n\tsrc/PortableAreas/Ornament.Web.ProtableAreas/Bus.cs\n\n\tsrc/PortableAreas/Ornament.Web.ProtableAreas/Controllers/EmbeddedResourceController.cs\n\n\tsrc/PortableAreas/Ornament.Web.ProtableAreas/PortableAreaStartupMessage.cs\n\tsrc/PortableAreas/Plugin/Areas/Plugin/Controllers/DefaultController.cs\n\tsrc/PortableAreas/Plugin/Areas/Plugin/PluginAreaRegistration.cs\n\tsrc/PortableAreas/Plugin/Plugin.csproj\n\tsrc/PortableAreas/Plugin/Web.config\n\tsrc/PortableAreas/Plugin/packages.config","distinct":true,"url":"https://api.github.com/repos/luqizheng/Ornament-Portable-Areas/commits/99ecd989200d5cfe530b306c6a512254f57050f0"}]}