Merge branch 'admin_pradeep' of github.com:Bharatupgraded/pillphone into admin_pradeep
Merge branch 'admin_pradeep' of github.com:Bharatupgraded/pillphone into provider_pravin_karan
Merge branch 'admin_pradeep' of github.com:Bharatupgraded/pillphone into admin_pradeep
Merge branch 'admin_pradeep' into provider_pravin_karan
consumer_drug.name was crashing into add_medication
merged provider_pravin_karan branch
forgot passord--changed
Merge branch 'admin_pradeep' of github.com:Bharatupgraded/pillphone into provider_pravin_karan
site_contents url is removed from routes.rb
routes update
new_provider registration was not working in firefox
routes were wrong
routes urls were wrong
modification on pill lookup
pill lookup search issue
footer customized; select drop-down image changed
Merge branch 'provider_pravin_karan' of github.com:Bharatupgraded/pillphone into provider_pravin_karan
Merge branch 'admin_pradeep' of github.com:Bharatupgraded/pillphone into provider_pravin_karan
migration regenerated to add_delta_into_provider
Merge branch 'provider_pravin_karan' into admin_pradeep