correo
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_ETTS
"cambios en interfaz de ver tickets, solo ven sus tickets los clientes, agregado preview de ticket, y envio de ticket a tt@etelix.com
"
mod en correo
fixed component enviaremail
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_ETTS
mensaje error de HEAD>>>>>>
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_ETTS
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_ETTS
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_ETTS
cambios
resolviendo conflcitos