Skip to content

Commit

Permalink
Merge branch 'main' into publish
Browse files Browse the repository at this point in the history
  • Loading branch information
akaravi committed Feb 19, 2024
2 parents 0c65f45 + bc0b7ac commit 5ae66ab
Show file tree
Hide file tree
Showing 6 changed files with 489 additions and 384 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
"search.useGlobalIgnoreFiles": true,
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": "explicit"
}
}
12 changes: 6 additions & 6 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
@@ -1,6 +1,6 @@
{
"name": "ntk-cms-web",
"version": "15.2.0912.2",
"version": "15.2.1130.1",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand Down Expand Up @@ -70,7 +70,7 @@
"ngx-ntk-smart-module": "^1.1.10",
"ngx-toastr": "^16.1.1",
"nouislider": "^15.7.1",
"ntk-cms-api": "^1.2.256",
"ntk-cms-api": "^1.2.260",
"ntk-cms-filemanager": "^1.2.31",
"object-path": "0.11.8",
"prism-themes": "1.9.0",
Expand Down
Loading

0 comments on commit 5ae66ab

Please sign in to comment.