Skip to content
Snippets Groups Projects
Commit 936366a2 authored by Oncar Rozaqy's avatar Oncar Rozaqy
Browse files

Merge branch 'develop' into 'feature/authentication'

# Conflicts:
#   frontend/src/components/TenantCard.tsx
parents 351f6f9d 0fa0dfc9
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