Merge branch 'development'

Browse Source

#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

...

This commit is contained in:

“VeLiTi”

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

parent b9193fc3dc 60a32a7ff9

commit e4ddab934c

39 changed files with 13014 additions and 4983 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

969

custom/css/main.css

File diff suppressed because it is too large Load Diff