Andal.LND/frontend-app-communications
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: resolved merge conflicts with master branch

Browse Source
This commit is contained in:
Bilal Qamar
2022-09-01 12:33:47 +05:00
parent 4e2577191d 15325f0eb1
commit 4977918e65
2 changed files with 879 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@@ -36,10 +36,10 @@
},
"dependencies": {
"@edx/brand": "npm:@edx/brand-openedx@1.1.0",
"@edx/frontend-component-footer": "10.1.6",
"@edx/frontend-component-header": "2.4.5",
"@edx/frontend-platform": "1.15.6",
"@edx/paragon": "19.18.3",
"@edx/frontend-component-footer": "11.2.0",
"@edx/frontend-component-header": "3.2.0",
"@edx/frontend-platform": "2.6.1",
"@edx/paragon": "19.25.3",
"@edx/tinymce-language-selector": "1.1.0",
"@fortawesome/fontawesome-svg-core": "1.2.36",
"@fortawesome/free-brands-svg-icons": "5.15.4",
@@ -50,7 +50,7 @@
"axios": "0.21.4",
"classnames": "2.3.1",
"core-js": "3.15.2",
"jquery": "3.6.0",
"jquery": "3.6.1",
"popper.js": "1.16.1",
"prop-types": "15.7.2",
"react": "16.14.0",