Merge master to dev to resolve conflicts#109

Merged

ShaiMagal merged 6 commits intoPrestaShop:devfrom Hlavtox:lalala

Sep 14, 2024

Commits on Jun 1, 2020

Merge pull request PrestaShop#51 from PrestaShop/dev
Progi1984
authored

Commits on Apr 27, 2022

Merge pull request PrestaShop#72 from PrestaShop/dev
Progi1984
authored

Commits on Mar 15, 2023

Merge pull request PrestaShop#82 from PrestaShop/dev
SharakPL
authored

Commits on Jun 8, 2023

Merge pull request PrestaShop#87 from PrestaShop/dev
nicosomb
authored

Commits on Jan 16, 2024

Release 3.1.4 (PrestaShop#98 )

authored

Commits on Sep 14, 2024

Resolve conflicts
Hlavtox
committed