Skip to content

Commit

Permalink
Merge pull request #1100 from openedx/aansari/rebase-with-master
Browse files Browse the repository at this point in the history
chore: rebase 2u-main with master
  • Loading branch information
awais-ansari authored Oct 10, 2024
2 parents 776cd12 + a134083 commit 739faa6
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 18 deletions.
51 changes: 35 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
],
"dependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/frontend-component-header": "5.4.0",
"@edx/frontend-platform": "8.1.1",
"@edx/frontend-component-header": "5.5.0",
"@edx/frontend-platform": "8.1.2",
"@edx/openedx-atlas": "^0.6.0",
"@fortawesome/fontawesome-svg-core": "6.6.0",
"@fortawesome/free-brands-svg-icons": "6.6.0",
Expand Down

0 comments on commit 739faa6

Please sign in to comment.