{"push_id":640114355,"size":2,"distinct_size":1,"ref":"refs/heads/merge_to_9.3.0.0","head":"bddeb4afa89dc6b863c8d74d7a296bbe58dffc20","before":"c96cffb78f9a025c1947cd563d33b01328e4bc60","commits":[{"sha":"b413bd1089b0d573cec0f2bd7d9d8b0d524e7f3e","author":{"email":"8800578b51f022c8d8adb9606a8b3db4fedbdac6@nordicshirts.com","name":"Hans Nilsson"},"message":"Update of vendor to 9.3.0.0","distinct":false,"url":"https://api.github.com/repos/DosMaster/ns/commits/b413bd1089b0d573cec0f2bd7d9d8b0d524e7f3e"},{"sha":"bddeb4afa89dc6b863c8d74d7a296bbe58dffc20","author":{"email":"8800578b51f022c8d8adb9606a8b3db4fedbdac6@nordicshirts.com","name":"Hans Nilsson"},"message":"Merge remote-tracking branch 'remotes/origin/vendor' into merge_to_9.3.0.0\n\nConflicts:\n\tASPDNSFCommon/AspDotNetStorefrontCommon.vbproj\n\tASPDNSFControls/AspDotNetStorefrontControls.vbproj\n\tASPDNSFControls/CartSummary.vb\n\tASPDNSFControls/CurrencySelectList.vb\n\tASPDNSFControls/LanguageSelectList.vb\n\tASPDNSFControls/My Project/AssemblyInfo.vb\n\tASPDNSFControls/NewsletterControlService.vb\n\tASPDNSFControls/PaymentMethod.vb\n\tASPDNSFControls/ShoppingCartLineItemDescriptionControl.vb\n\tASPDNSFCore/AppLogic.vb\n\tASPDNSFCore/AspDotNetStorefrontCore.vbproj\n\tASPDNSFCore/My Project/AssemblyInfo.vb\n\tASPDNSFCore/Order.vb\n\tASPDNSFCore/Prices.vb\n\tASPDNSFCore/ShoppingCart.vb\n\tASPDNSFCore/SysLog.vb\n\tASPDNSFCore/app.config\n\tASPDNSFGatewayProcessors/GatewayManual/GatewayManual.vbproj\n\tASPDNSFGatewayProcessors/GatewayPayPal/GatewayPayPal.vbproj\n\tASPDNSFGateways/AspDotNetStorefrontGateways.vbproj\n\tASPDNSFGateways/Gateway.vb\n\tASPDNSFGateways/My Project/AssemblyInfo.vb\n\tASPDNSFGateways/Web References/CardiaAPI/Reference.vb\n\tASPDNSFGateways/Web References/MaxMindAPI/MINFRAUD2.datasource\n\tASPDNSFGateways/Web References/PPSCommerce/Response.datasource\n\tASPDNSFLayout/AspDotNetStorefrontLayout.vbproj\n\tASPDNSFWSI/AspDotNetStorefrontWSI.vbproj\n\tAspDotNetStorefront9.sln\n\tAspDotNetStorefrontAdmin/AspDotNetStorefrontAdmin.vbproj\n\tAspDotNetStorefrontEvents/AspDotNetStorefrontEventHandlers.vbproj\n\tAvalaraTaxAddIn/AvalaraTaxAddIn.csproj\n\tWeb/Admin/coupons.aspx\n\tWeb/Admin/coupons.aspx.vb\n\tWeb/Admin/editCoupons.aspx\n\tWeb/Admin/editCoupons.aspx.vb\n\tWeb/App_Code/SkinBase.vb\n\tWeb/App_Templates/Skin_1/template.master\n\tWeb/App_Templates/Skin_2/XmlPackages/upsellproducts.xml.config\n\tWeb/App_Templates/Skin_2/template.master\n\tWeb/App_Themes/Admin_Default/StyleSheet.css\n\tWeb/App_Themes/Skin_2/images/orderinfo.gif\n\tWeb/App_Themes/Skin_2/images/step_6.gif\n\tWeb/account.aspx.vb\n\tWeb/checkout1.aspx.vb\n\tWeb/checkoutpayment.aspx.vb\n\tWeb/controls/Signin.ascx.vb\n\tWeb/default2.aspx\n\tWeb/engine.aspx.vb\n\tWeb/shoppingcart.aspx\n\tWeb/shoppingcart.aspx.vb\n\tWeb/signin.aspx.vb\n\tWeb/web.config\n\tXsltObjects/XsltObjects.vbproj","distinct":true,"url":"https://api.github.com/repos/DosMaster/ns/commits/bddeb4afa89dc6b863c8d74d7a296bbe58dffc20"}]}