changes
ADT start
ADT start
settings, facility details
Database password change
Facility details
Merge branch 'master' of https://github.com/wambuimungai/ADT
issues changes
pending issues
Merge branch 'master' of https://github.com/wambuimungai/ADT

Conflicts:s
	application/controllers/auto_management.php
	application/views/patient_listing_v.php
	application/views/sections/link.php
changes
Recent changes
changes
Changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/controllers/patient_management.php
	application/controllers/system_management.php
	application/views/dispense_v.php
	application/views/patient_listing_v.php
	application/views/sections/link.php
	assets/styles/select2-3.4.8/select2.css
changes
changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/controllers/dispensement_management.php
	application/controllers/patient_management.php
	application/views/dispense_v.php
	application/views/patient_listing_v.php
	application/views/sections/link.php
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	Export/AGGR#201401.xls
	application/config/database.php
	application/controllers/patient_management.php
	application/views/report_v.php
	application/views/sections/link.php
changes