Skip to content
Commit da8a5c00 authored by RafaUC's avatar RafaUC
Browse files

Merge branch 'main' into 'dev-RafaUC' 

# Conflicts:
#   cosiap_api/dynamic_forms/models.py
#   cosiap_api/modalidades/models.py
parents 6194ff3d b83663e0
Hide whitespace changes
Inline Side-by-side
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