pull changes
pull changes
Conflict removed
issue resolved for faq and style.css updated
Change password design
conflict removed
Change password design
conflict removed db.yml
personal_information
personal_information
personal_information
Rating - Popup
Conflict rmoved
Merge branch 'development'
gemfile updated
Booking page integrated
Changes
Merge branch 'master' into development