merdan 84d77539e9 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 ... Conflicts: composer.lock packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php		2022-02-22 17:50:56 +05:00
..
src	Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1	2022-02-22 17:50:56 +05:00
.gitignore	helper function updated	2020-01-21 15:13:01 +05:30
composer.json	Removed require from packages, leave the require on the root project	2020-08-13 09:46:43 -03:00