alejandro 23 enero 330pm
maestro arreglar git
peoMerge branch 'master' of https://github.com/ingjaso/ticketes

Conflicts:
	view/templates_c/269775aeac46eb00745560109e4992ccace306d9.file.AgregarEvento.tpl.php