fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	empresa/historial-ofertas-e.php