Commit 00858fa4 authored by Juraj Fiala's avatar Juraj Fiala
Browse files

Merge branch 'main' into 'feat/login'

# Conflicts:
#   frontend/src/app/agent/agent-detail.component.html
#   frontend/src/app/agent/agent-detail.component.ts
#   frontend/src/app/agent/agent-list.component.html
#   frontend/src/app/agent/agent-list.component.ts
#   frontend/src/app/agent/agent.interface.ts
#   frontend/src/app/app-routing.module.ts
#   frontend/src/app/app.module.ts
#   frontend/src/app/home/home.component.html
parents 37d64467 3a53564f
Pipeline #141205 waiting for manual action with stage
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment