Merge remote-tracking branch 'origin/develop' into analytics
# Conflicts: # public/locales/en/settings.json # src/views/Settings/DeveloperSettings.jsx # src/views/Settings/SettingsOverview.jsx
This commit is contained in:
2
package-lock.json
generated
2
package-lock.json
generated
@@ -39,7 +39,7 @@
|
||||
"@jcesarmobile/capacitor-ocr": "^0.3.0",
|
||||
"@meauxt/react-swipeable-list": "^1.0.0",
|
||||
"@mui/icons-material": "^5.16.13",
|
||||
"@mui/joy": "^5.0.0-beta.20",
|
||||
"@mui/joy": "5.0.0-beta.52",
|
||||
"@mui/material": "^5.15.2",
|
||||
"@openreplay/tracker": "^14.0.4",
|
||||
"@revenuecat/purchases-capacitor": "^12.0.0",
|
||||
|
||||
Reference in New Issue
Block a user