Closed bryanlandia closed 8 months ago
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
318 |
Current conflicts | 318 |
Summary | Good work! No added conflicts. |
Change description
Sync Dockerfile.tutor with latest server-vars.yml for Tahoe prod Catching up on some for figures, gradefetcher Adding new openedx-scorm-xblock to match https://github.com/appsembler/edx-configs/pull/1586
Type of change
Related issues
https://appsembler.atlassian.net/browse/ENG-302
Checklists
Development
Security
Code review