b

b
Revert "b"

This reverts commit e12d3d43a705995c77b5633dcb88123e0ca01a09.
Merge branch 'master' of https://github.com/QADM/SCG.git
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/v2'
cambio estetico reporte Actividades

cambio estetico reporte Actividades
Merge pull request #270 from salvadorcortes/master

cambio estetico reporte de actividades