Merge branch 'desarrollo' into 'pruebas'
Desarrollo
See merge request !43 (merged)
(cherry picked from commit d19cbfbe)
bdaec0ff OPT: Se habilita Plan de trabajo académico b3e2994a Merge branch 'Tiquete-10032848' into 'desarrollo' 0d1a28e8 Merge branch 'Tiquete-10032848' into 'desarrollo' b4b76beb Merge remote-tracking branch 'origin/desarrollo' into desarrollo a00f19c2 Merge remote-tracking branch 'origin/desarrollo' into desarrollo 27af0c77 Merge remote-tracking branch 'origin/desarrollo' into desarrollo