phpqrcode-pruebas
Merge remote-tracking branch 'origin/master'

Conflicts:
	final/php/Reserva.pdf
	final/php/dompdf/lib/fonts/log.htm