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

Update from main (production) #1369

Merged
merged 6 commits into from
Sep 14, 2023
Merged

Update from main (production) #1369

merged 6 commits into from
Sep 14, 2023

Conversation

github-actions[bot]
Copy link

This is an automated pull request to update from branch main

…hed-edx-sga-0.22.0

Fix version override: Use edx-sga 0.22.0 via appsembler.txt reqs
ENG-97
Try to fix continuing cases of window.onYouTubeIframeAPIReady.resolve is not a function
and retry the full function
…y-yt-api-errs

ENG-97 Try/Catch around more of the onYouTubeIframeAPIReady code to retry
@github-actions
Copy link
Author

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with open-release/nutmeg.master
Benchmark conflicts with prod 299
Current conflicts 299
Summary Good work! No added conflicts.
Comparing with master
Benchmark conflicts with prod 317
Current conflicts 317
Summary Good work! No added conflicts.

@bryanlandia bryanlandia merged commit 6cf8940 into prod Sep 14, 2023
24 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.

2 participants