Skip to content
Snippets Groups Projects
Commit e134568b authored by Arie Peterson's avatar Arie Peterson
Browse files

Merge branch 'main' into '197-support-webauthn'

# Conflicts:
#   backend/requirements.txt
parents 30b8d990 4c3eee6d
No related branches found
No related tags found
1 merge request!175Resolve "Support WebAuthn"
Pipeline #47363 passed with stages
in 2 minutes and 55 seconds
......@@ -50,11 +50,11 @@ flask-sqlalchemy==3.1.1
# flask-migrate
google-auth==2.34.0
# via kubernetes
greenlet==3.0.3
greenlet==3.1.0
# via sqlalchemy
gunicorn==23.0.0
# via -r requirements.in
idna==3.8
idna==3.10
# via requests
itsdangerous==2.2.0
# via flask
......@@ -91,15 +91,15 @@ pip-install==1.3.5
# via -r requirements.in
posix-ipc==1.1.1
# via -r requirements.in
pyasn1==0.6.0
pyasn1==0.6.1
# via
# pyasn1-modules
# rsa
pyasn1-modules==0.4.0
pyasn1-modules==0.4.1
# via google-auth
pydantic==2.9.0
pydantic==2.9.1
# via ory-kratos-client
pydantic-core==2.23.2
pydantic-core==2.23.3
# via pydantic
pyjwt==2.9.0
# via flask-jwt-extended
......@@ -110,7 +110,7 @@ python-dateutil==2.9.0.post0
# kubernetes
# ory-hydra-client
# ory-kratos-client
pytz==2024.1
pytz==2024.2
# via apscheduler
pyyaml==6.0.2
# via
......@@ -153,8 +153,6 @@ typing-extensions==4.12.2
# pydantic
# pydantic-core
# sqlalchemy
tzdata==2024.1
# via pydantic
tzlocal==5.2
# via apscheduler
urllib3==2.0.7
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment