“VeLiTi” e4ddab934c Merge branch 'development' ...

#Conflicts:
#	admin/countries.php
#	cart.php
#	custom/css/main.css
#	custom/customfunctions.php
#	custom/email/order-details-template.php
#	custom/email/order-invoice-template.php
#	custom/email/order-notification-template.php
#	custom/pages/about.php
#	custom/pages/about_morval.php
#	custom/settings/config.php
#	custom/settings/settings.php
#	functions.php
#	home.php
#	products.php
#	script.js

2025-08-12 15:46:06 +02:00

..

email_template_register.php

CMXX - First testing

2025-03-07 15:07:15 +01:00

email_template_reset.php

CMXX - First testing

2025-03-07 15:07:15 +01:00

order-details-template.php

Merge branch 'development'

2025-08-12 15:46:06 +02:00

order-invoice-template.php

Merge branch 'development'

2025-08-12 15:46:06 +02:00

order-notification-template.php

Merge branch 'development'

2025-08-12 15:46:06 +02:00