Merge remote-tracking branch 'origin/2.2' into master-3.0

# Conflicts:
#	package.json
#	src/app/layouts/default-layout/default-layout.component.html
#	src/app/layouts/default-layout/default-layout.component.ts
#	yarn.lock
This commit is contained in:
grossmj
2024-07-22 19:16:37 +02:00
6 changed files with 10 additions and 9 deletions

View File

@ -1,6 +1,6 @@
setuptools==65.5.1
setuptools==71.1.0
cx_Freeze==5.1.1
requests==2.31.0
requests==2.32.3
packaging==20.9
appdirs==1.4.4
psutil==5.8.0