Merge branch 'master' of github.com:pennlabs/penn-courses into pennla…

…bs-master # Conflicts: # .github/cdk/main.ts # .gitignore # backend/PennCourses/docs_settings.py # backend/Pipfile # backend/Pipfile.lock # backend/courses/management/commands/merge_topics.py # backend/courses/migrations/0054_alter_ngssrestriction_inclusive.py # backend/courses/urls.py # backend/courses/views.py # backend/review/urls.py # backend/tests/alert/test_alert.py # backend/tests/courses/test_api.py # frontend/package.json # frontend/yarn.lock
pennlabs · Nov 12, 2023 · 056b915 · 056b915
2 parents 2c84e26 + 9f54efd
commit 056b915
Show file tree

Hide file tree

Showing 116 changed files with 24,218 additions and 3,799 deletions.
diff --git a/.github/cdk/.gitignore b/.github/cdk/.gitignore
diff --git a/.github/cdk/cdkactions.yaml b/.github/cdk/cdkactions.yaml
diff --git a/.github/cdk/main.ts b/.github/cdk/main.ts
diff --git a/.github/cdk/package.json b/.github/cdk/package.json
diff --git a/.github/cdk/tsconfig.json b/.github/cdk/tsconfig.json
diff --git a/.github/cdk/yarn.lock b/.github/cdk/yarn.lock
diff --git a/.github/workflows/cdkactions_validate.yaml b/.github/workflows/cdkactions_validate.yaml