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

Feature/announces #195

Merged
merged 33 commits into from
Dec 8, 2023
Merged

Feature/announces #195

merged 33 commits into from
Dec 8, 2023

Conversation

Pietrucci-Blacher
Copy link
Owner

No description provided.

# Conflicts:
#	back/api/composer.lock
#	back/api/src/Entity/Establishment.php
#	back/api/src/Entity/User.php
#	front/package-lock.json
#	front/package.json
#	front/pnpm-lock.yaml
#	front/src/pages/admin/establishment/index.jsx
#	front/src/pages/provider/establishment/update/[id].jsx
# Conflicts:
#	back/api/src/Entity/AvailableSlot.php
#	back/api/src/Entity/Comment.php
#	back/api/src/Entity/Establishment.php
#	back/api/src/Entity/Payment.php
#	back/api/src/Entity/Service.php
#	back/api/src/Entity/User.php
#	back/api/src/Repository/ServiceRepository.php
#	front/pnpm-lock.yaml
#	front/src/layouts/ProviderLayout.jsx
@Ossama9 Ossama9 merged commit d9cca57 into develop Dec 8, 2023
1 check failed
@Ossama9 Ossama9 deleted the feature/announces branch December 8, 2023 18:31
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