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

Resolve merge conflicts from Stable -> Release-1.0 #4794

Merged
merged 18 commits into from
Oct 31, 2024

Conversation

lykinsbd
Copy link
Contributor

No description provided.

BaptisteGi and others added 18 commits October 11, 2024 15:07
We recently introduced changes to docker compose file. This was creating a discrepancy between the docker file (on develop branch) and the demo docker images (on stable). Thus the command invoke demo.start wasn't working anymore from develop branch. This has been solved with the newest release.
[FIX] Added context on relationship add mutation (#4621)
* Update resource manager topic with latest features

(cherry picked from commit 27f4f86)
The Branch button is in the top left corner, this is probably a typo.
* edited creating a schema page
* fixed typo
@github-actions github-actions bot added the type/documentation Improvements or additions to documentation label Oct 31, 2024
@lykinsbd
Copy link
Contributor Author

This PR resolves merge conflicts raised in #4792

@lykinsbd lykinsbd merged commit a719476 into release-1.0 Oct 31, 2024
24 checks passed
@lykinsbd lykinsbd deleted the bdl-20241030-stable-merge-conflicts branch October 31, 2024 00:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants