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

Merge branch 'main' into 'dev-AdalbertoCV' 

# Conflicts:
#   cosiap_api/dynamic_forms/models.py
#   cosiap_api/modalidades/models.py
#   cosiap_api/solicitudes/tests.py
parents 7af6370a 06270ca4
Expand all 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