Skip to content

Commit

Permalink
Merge branch 'master' into feat/platform-android-offline
Browse files Browse the repository at this point in the history
  • Loading branch information
jiongxuan authored Oct 9, 2024
2 parents 332a74b + 20d1b74 commit f18735b
Show file tree
Hide file tree
Showing 5 changed files with 196 additions and 52 deletions.
110 changes: 76 additions & 34 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@
"devDependencies": {
"@angular-devkit/build-angular": "^18.1.4",
"@angular-eslint/builder": "^18.3.0",
"@angular-eslint/eslint-plugin": "^18.0.1",
"@angular-eslint/eslint-plugin": "^18.3.1",
"@angular-eslint/eslint-plugin-template": "^18.0.1",
"@angular-eslint/schematics": "^18.3.0",
"@angular-eslint/schematics": "^18.3.1",
"@angular-eslint/template-parser": "^18.0.1",
"@angular/animations": "^18.1.4",
"@angular/cdk": "^18.1.4",
Expand Down Expand Up @@ -220,7 +220,7 @@
"stacktrace-js": "^2.0.1",
"start-server-and-test": "^1.14.0",
"ts-node": "~10.9.1",
"tslib": "^2.4.1",
"tslib": "^2.7.0",
"typescript": "~5.4.5",
"utils-decorators": "^2.0.8",
"webdav": "~4.11.3",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,7 @@
"NL": "Nederlands",
"PL": "Polish",
"PT": "Português",
"RU": "Русский",
"RU": "Russian",
"SK": "Slovak",
"TITLE": "Language",
"TR": "Türkçe",
Expand Down
Loading

0 comments on commit f18735b

Please sign in to comment.