vendor compiled
Merge remote-tracking branch 'origin/habitaciones'
Merge remote-tracking branch 'origin/reservaciones'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Vendor assets compiled
Merge remote-tracking branch 'origin/master'
Vendor assets compiled
Merge remote-tracking branch 'origin/master'
Vendor assets compiled
Merge remote-tracking branch 'origin/luis'

Conflicts:
	config/locales/es.yml
merge
Vendor compile
Merge remote-tracking branch 'origin/luis'

Conflicts:
	config/locales/es.yml
Vendor compiled
Merge remote-tracking branch 'origin/luis'
vendor compile
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/locales/es.yml
assets compiled
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/locales/es.yml