Skip to content
Commit c7d21035 authored by Alfonso Rafael Solis Rangel's avatar Alfonso Rafael Solis Rangel
Browse files

Merge branch 'main' into 'catalago-grupos' 

# Conflicts:
#   routes/web.php
parents 60f35975 9f3d6ece
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