drug_attribute model is created
Merge branch 'provider_pravin_karan' of github.com:Bharatupgraded/pillphone into provider_pravin_karan
is_generic datatype changed for drug_attribute model
drug_attributes model migration generated
conflicts resolved
Merge branch 'provider_pravin_karan' of github.com:Bharatupgraded/pillphone