removed redis and loading images
Reminders and consumer compliances
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
added where to remove is_active != nill
Merge branch 'admin_pradeep'
conflicts resolved
migaration file for consumers table missing column added
Merge branch 'master' into provider_pravin_karan
consumer_name column of consumers table is added
merge conflicts fixed in gemfile and calculation.rb file
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
resolved conflicts in Gemfile
includes replaced with include
merged master branch in provider
fixed Gemfile
removed unnecessary migration
removed turbolinks
conflicts resolved
exprementing with indices
fixing providers index