ctrlpanel/resources
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
..
css Auto stash before revert of "Merge remote-tracking branch 'origin/development' into development" 2021-06-10 23:29:25 +02:00
js new server create page w.i.p 2021-11-06 01:56:57 +01:00
lang Update es.json 2021-12-16 22:39:10 +01:00
sass Auto stash before revert of "Merge remote-tracking branch 'origin/development' into development" 2021-06-10 23:29:25 +02:00
views Merge branch 'development' into stripe_integration 2021-12-17 10:41:32 +01:00