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) #1350

Merged
merged 8 commits into from
Jun 30, 2023
Merged

Update from main (production) #1350

merged 8 commits into from
Jun 30, 2023

Conversation

github-actions[bot]
Copy link

This is an automated pull request to update from branch main

@github-actions

This comment has been minimized.

Handles edge case with remaining Users without an IdP UserSocialAuth
@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 298
Current conflicts 298
Summary Good work! No added conflicts.
Comparing with master
Benchmark conflicts with prod 313
Current conflicts 313
Summary Good work! No added conflicts.

@bryanlandia bryanlandia merged commit f1a3a0d into prod Jun 30, 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.

1 participant