Tags: rliebi/pimcore
Tags
Merge remote-tracking branch 'origin/10.6' into 11.x # Conflicts: # bundles/EcommerceFrameworkBundle/src/VoucherService/TokenManager/Pattern.php # bundles/EcommerceFrameworkBundle/src/VoucherService/TokenManager/Single.php # models/DataObject/Data/Link.php # models/Document/Service.php
Merge remote-tracking branch 'origin/10.6' into 11.x # Conflicts: # composer.json # doc/Development_Documentation/23_Installation_and_Upgrade/01_System_Requirements.md # models/DataObject/ClassDefinition/Data/Slider.php
updated docs (pimcore#14094) Co-authored-by: hethehe <105442500+hethehe@users.noreply.github.com> Co-authored-by: hethehe <105442500+hethehe@users.noreply.github.com>
Merge remote-tracking branch 'origin/10.6' into 11.x # Conflicts: # bundles/AdminBundle/src/Controller/Admin/DataObject/DataObjectHelperController.php # models/DataObject/ClassDefinition/Data/Multiselect.php
PreviousNext