search

appsembler / edx-platform

Appsembler Tahoe fork of Open edX. Branches: `main` for Juniper and `hawthorn/main` for Hawthorn.
https://appsembler.com/products/tahoe/
GNU Affero General Public License v3.0
13 stars 15 forks source link

Update from `main` (production) #1322

Closed github-actions[bot] closed 1 year ago

github-actions[bot] commented 1 year ago

This is an automated pull request to update from branch main

github-actions[bot] commented 1 year ago

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

Comparing with open-release/nutmeg.master
Benchmark conflicts with prod 292
Current conflicts 292
Summary Good work! No added conflicts.
Comparing with master
Benchmark conflicts with prod 300
Current conflicts 300
Summary Good work! No added conflicts.
github-actions[bot] commented 1 year ago

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

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