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

Merge branch 'main' into 'dev-AdalbertoCV' 

# Conflicts:
#   cosiap_api/common/views.py
#   cosiap_api/notificaciones/tests.py
parents 74384fd3 824c2f84
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