Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-8b240f0f993f32bbebfe1f7c445a1f36
Browse files Browse the repository at this point in the history
  • Loading branch information
ludeknovy authored Mar 8, 2024
2 parents 07f1aac + 373480c commit 700e8ce
Show file tree
Hide file tree
Showing 88 changed files with 8,851 additions and 10,606 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ yarn-error.log
testem.log
/typings
/pacts
/.angular/cache

# System Files
.DS_Store
Expand Down
8 changes: 4 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
],
"styles": [
"src/styles.scss",
"node_modules/ngx-toastr/toastr.css"
"node_modules/ngx-toastr/toastr.css",
"node_modules/ngx-spinner/animations/line-spin-fade.css"
],
"scripts": [],
"aot": false,
Expand Down Expand Up @@ -130,6 +131,5 @@
}
}
}
},
"defaultProject": "jtl-reporter"
}
}
}
Loading

0 comments on commit 700e8ce

Please sign in to comment.