Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PIPRES-342: Cloudsync connect #831

Merged
merged 6 commits into from
Jan 16, 2024

Conversation

mandan2
Copy link
Contributor

@mandan2 mandan2 commented Oct 17, 2023

Migrated changes from previous cloudsync connect #826 pull request due to difficult rebase.

Can't merge this PR as ps-mbo installer dependency breaks sentry functionality with incompatible php-http/client-common version with Sentry's ClientInterface type.

image

@mandan2 mandan2 self-assigned this Oct 17, 2023
JevgenijVisockij and others added 5 commits January 16, 2024 13:21
# Conflicts:
#	controllers/admin/AdminMollieSettingsController.php
#	views/templates/admin/logo.tpl
…ng from the prestashop

# Conflicts:
#	composer.json
#	src/Exception/Code/ExceptionCode.php
# Conflicts:
#	composer.json
@JevgenijVisockij JevgenijVisockij force-pushed the PIPRES-342-cloudsync-connect branch from ee984fd to 588bfbf Compare January 16, 2024 11:25
@JevgenijVisockij JevgenijVisockij merged commit ac82ed7 into release-6.0.5 Jan 16, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants