merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sarga/packages/Webkul/Shop
History
merdan 690a33710f Merge branch 'master' of https://github.com/bagisto/bagisto into dev 
 Conflicts:
	.env.example
	README.md
	composer.json
	composer.lock
	config/app.php
	config/scout.php
	packages/Webkul/API/Http/Controllers/Shop/AddressController.php
	packages/Webkul/API/Http/Resources/Checkout/Cart.php
	packages/Webkul/API/Http/Resources/Sales/Order.php
	packages/Webkul/API/Http/routes.php
	packages/Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php
	packages/Webkul/Core/src/Resources/lang/fa/validation.php
	packages/Webkul/Core/src/Resources/lang/it/app.php
	packages/Webkul/Core/src/Resources/lang/pt_BR/app.php
	packages/Webkul/Core/src/Resources/lang/tr/app.php
	packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
	packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-product.blade.php
	packages/Webkul/Velocity/publishable/assets/js/components.js
	packages/Webkul/Velocity/publishable/assets/js/manifest.js
	public/installer/Classes/Requirement.php
 		2022-02-01 15:01:06 +05:00
..
publishable/assets resolve conflicts and merge master 2022-01-25 13:57:27 +05:30
src Merge branch 'master' of https://github.com/bagisto/bagisto into dev 2022-02-01 15:01:06 +05:00
.gitignore Updated gitignore 2020-10-05 10:58:41 +02:00
.gitrepo git subrepo init (merge) --remote=git@github.com:bagistobrasil/core-shop.git packages/Webkul/Shop 2020-08-04 10:57:09 -03:00
composer.json helper function updated 2020-01-21 15:13:01 +05:30
package.json Shop Dependency Updated 2021-05-27 12:57:35 +05:30
webpack.mix.js helper function updated 2020-01-21 15:13:01 +05:30