Skip to content

Commit

Permalink
Merge branch 'master' into keycloak_login
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
  • Loading branch information
TheSlimvReal committed Nov 22, 2023
2 parents d1c793f + 4f7a618 commit 83a7ba9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@fortawesome/free-regular-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@ngneat/until-destroy": "^10.0.0",
"@sentry/browser": "^7.76.0",
"@sentry/browser": "^7.77.0",
"angulartics2": "^12.2.1",
"assert": "^2.0.0",
"crypto-es": "^2.1.0",
Expand Down

0 comments on commit 83a7ba9

Please sign in to comment.