IceToast
|
754a3e38b8
|
Merge branch 'development' into stripe_integration
# Conflicts:
# app/Http/Controllers/Admin/CreditProductController.php
# app/Http/Controllers/Admin/PaymentController.php
# composer.lock
# resources/views/admin/payments/index.blade.php
# resources/views/admin/store/edit.blade.php
# resources/views/store/checkout.blade.php
# resources/views/store/index.blade.php
|
2021-12-17 10:41:32 +01:00 |
|