Union sftp-pedidos
Merge branch 'reservas' of https://github.com/jjvelascog/pagina into reservas

Conflicts:
	app/controllers/pedidos_controller.rb