GitHub PushEvent at 2014-06-26 17:15:17
Repository: HCMPv2
Actor: CollinsIchigo
Payload: {"shas":[["af8fa0361b597b1dfa060fbf2ae5d8b06e8b4dd2","48dc708ef9fb50c4b859aa4c911eb693aaa2273f@gmail.com","blank","kariukijackson",true],["f26e881484af68fff1bb270c1924c3b63bdef450","48dc708ef9fb50c4b859aa4c911eb693aaa2273f@gmail.com","Merge branch 'master' of https://github.com/MesAdima/HCMP-version2","kariukijackson",true],["71f8e95ea2b8add7af5b5e6f19df3c0ef4004b27","48dc708ef9fb50c4b859aa4c911eb693aaa2273f@gmail.com","Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2\n\nConflicts:\n application/controllers/reports.php","kariukijackson",true],["a7bae7cf72a24480e9a7e50f42c4acd17449cb71","48dc708ef9fb50c4b859aa4c911eb693aaa2273f@gmail.com","fixed","kariukijackson",true],["079c954dbfd2fe9d149c86cf0c3b7c9330e70d15","48dc708ef9fb50c4b859aa4c911eb693aaa2273f@gmail.com","Merge branch 'master' of https://github.com/MesAdima/HCMP-version2\n\nConflicts:\n\t.htaccess\n\tapplication/controllers/divisional_reports.php\n\tapplication/controllers/reports.php\n\tapplication/models/facility_orders.php\n\tapplication/models/facility_stocks.php\n\tapplication/models/facility_stocks_temp.php\n\tapplication/views/facility/facility_issues/facility_redistribute_items_v.php\n\tapplication/views/facility/facility_reports/ajax/consumption_stats_ajax.php\n\tapplication/views/facility/facility_reports/ajax/facility_expiry_filter_v.php\n\tapplication/views/facility/facility_reports/ajax/facility_orders_filter_v.php\n\tapplication/views/facility/facility_reports/facility_reports_malaria_reports_v.php\n\tapplication/views/facility/facility_reports/tb_report.php\n\tapplication/views/shared_files/report_templates/side_bar_v.php\n\tapplication/views/subcounty/reports/program_reports_v.php","kariukijackson",true],["369e8530b4bb5435744245ceddbf5eb415f6bbe4","48dc708ef9fb50c4b859aa4c911eb693aaa2273f@gmail.com","Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2\n\nConflicts:\n\tapplication/controllers/divisional_reports.php\n\tapplication/controllers/reports.php\n\tapplication/models/facility_orders.php\n\tapplication/models/facility_stocks_temp.php\n\tapplication/views/facility/facility_issues/facility_redistribute_items_v.php\n\tapplication/views/facility/facility_reports/ajax/consumption_stats_ajax.php\n\tapplication/views/facility/facility_reports/ajax/facility_expiry_filter_v.php\n\tapplication/views/facility/facility_reports/ajax/facility_orders_filter_v.php\n\tapplication/views/shared_files/report_templates/side_bar_v.php\n\tapplication/views/subcounty/reports/program_reports_v.php","kariukijackson",true],["42e057b12dd7ba9a7725654f4f060588badc1699","6aaae1987a965aca787847cd6eeb7946768ad5a3@gmail.com","Merge with Jack","CollinsIchigo",true],["91d8ca706db2dd8c6c6f2727c9bb5aa60a5e903a","6aaae1987a965aca787847cd6eeb7946768ad5a3@gmail.com","Final COpy","CollinsIchigo",true]],"size":8,"ref":"refs/heads/master","head":"91d8ca706db2dd8c6c6f2727c9bb5aa60a5e903a"}