GitHub PushEvent at 2014-05-25 16:20:51
Repository: OFSS
Actor: chubwa
Payload: {"shas":[["b88ae275dea58a98fd4d843b5b8c4118a8c4f811","bf036b0abf3f5dd009416a711ec99850dd5f110e@gmail.com","Merge origin/master\n\nConflicts:\n\tapplication/config/database.php\n\tapplication/controllers/dashbord.php\n\tapplication/controllers/login.php\n\tapplication/models/dashbord_model.php\n\tapplication/views/admin_dashbord.php\n\tapplication/views/admin_dashbord_update.php\n\tapplication/views/admin_message_view.php\n\tapplication/views/alert_view.php\n\tapplication/views/dashbord.php\n\tapplication/views/dashbord_msg.php\n\tapplication/views/footer.php\n\tapplication/views/header.php\n\tassets/css/bootstrap-combined.min.css\n\tassets/css/bootstrap-responsive.css\n\tassets/css/bootstrap.css\n\tassets/css/bootstrap.min.css\n\tassets/css/bootstrap_1.css\n\tassets/css/datepicker.css\n\tassets/css/jquery.dataTables.css\n\tassets/css/jquery.ui.all.css\n\tassets/css/jquery.ui.datepicker.css\n\tassets/css/ofss.css\n\tassets/css/open-iconic-bootstrap.css\n\tassets/css/open-iconic-bootstrap.min.css\n\tassets/font-awesome/fonts/fontawesome-webfont.eot\n\tassets/font-awesome/fonts/fontawesome-webfont.svg\n\tassets/font-awesome/fonts/fontawesome-webfont.ttf\n\tassets/font-awesome/fonts/fontawesome-webfont.woff\n\tassets/js/bootstrap-alert.js\n\tassets/js/bootstrap-datepicker.js\n\tassets/js/bootstrap-dropdown.js\n\tassets/js/bootstrap-modal.js\n\tassets/js/bootstrap.js\n\tassets/js/bootstrap.min.js\n\tassets/js/jquery-1.10.2.js\n\tassets/js/jquery-2.0.3.min.js\n\tassets/js/jquery.dataTables.min.js\n\tassets/js/jquery.min.js\n\tassets/js/jquery.mobile-1.4.2.min.js\n\tassets/js/jquery.ui.core.js\n\tassets/js/jquery.ui.datepicker.js\n\tassets/js/jquery.ui.widget.js\n\tassets/js/tabcordion.js\n\tassets/ncss/bootstrap.css\n\tassets/ncss/bootstrap.min.css\n\tfonts/glyphicons-halflings-regular.eot\n\tfonts/glyphicons-halflings-regular.svg\n\tfonts/glyphicons-halflings-regular.ttf\n\tfonts/glyphicons-halflings-regular.woff\n\timg/ appe.gif\n\timg/1.png\n\timg/10.png\n\timg/11.png\n\timg/12.png\n\timg/13.png\n\timg/14.png\n\timg/15.png\n\timg/16.png\n\timg/17.png\n\timg/18.png\n\timg/19.png\n\timg/2.png\n\timg/20.png\n\timg/21.png\n\timg/22.png\n\timg/23.png\n\timg/24.png\n\timg/25.png\n\timg/26.png\n\timg/27.png\n\timg/28.png\n\timg/29.png\n\timg/3.png\n\timg/30.png\n\timg/31.png\n\timg/32.png\n\timg/33.png\n\timg/34.png\n\timg/35.png\n\timg/36.png\n\timg/37.png\n\timg/38.png\n\timg/39.png\n\timg/4.png\n\timg/40.png\n\timg/41.png\n\timg/42.png\n\timg/43.png\n\timg/44.png\n\timg/45.png\n\timg/46.png\n\timg/47.png\n\timg/48.png\n\timg/49.png\n\timg/5.png\n\timg/50.png\n\timg/51.png\n\timg/52.png\n\timg/53.png\n\timg/54.png\n\timg/55.png\n\timg/56.png\n\timg/57.png\n\timg/58.png\n\timg/59.png\n\timg/6.png\n\timg/60.png\n\timg/61.png\n\timg/62.png\n\timg/63.png\n\timg/64.png\n\timg/65.png\n\timg/66.png\n\timg/67.png\n\timg/68.png\n\timg/69.png\n\timg/7.png\n\timg/70.png\n\timg/71.png\n\timg/72.png\n\timg/73.png\n\timg/74.png\n\timg/75.png\n\timg/76.png\n\timg/77.png\n\timg/78.png\n\timg/79.png\n\timg/8.png\n\timg/80.png\n\timg/9.png\n\timg/account-login.svg\n\timg/account-logout.svg\n\timg/dashboard.svg\n\timg/document.svg\n\timg/external-link.svg\n\timg/eye.svg\n\timg/flag.svg\n\timg/folder.svg\n\timg/glyphicons-halflings-white.png\n\timg/glyphicons-halflings.png\n\timg/home.svg\n\timg/inbox.svg\n\timg/loading.gif\n\timg/moving .gif\n\timg/pencil.svg\n\timg/person.svg\n\timg/print.svg\n\timg/rss-alt.svg\n\timg/rss.svg\n\timg/star.svg\n\timg/target.svg\n\timg/task.svg\n\tsystem/core/Benchmark.php\n\tsystem/core/CodeIgniter.php\n\tsystem/core/Config.php\n\tsystem/core/Exceptions.php\n\tsystem/core/Hooks.php\n\tsystem/core/Input.php\n\tsystem/core/Lang.php\n\tsystem/core/Model.php\n\tsystem/core/Output.php\n\tsystem/core/Router.php\n\tsystem/core/Security.php\n\tsystem/core/URI.php\n\tsystem/database/DB.php\n\tuser_guide/images/reactor-bullet.png\n\tuser_guide/nav/moo.fx.js\n\tuser_guide/nav/prototype.lite.js","chubwa",true],["4f54a8da443247f99fdbdac3d71130d764d61a14","bf036b0abf3f5dd009416a711ec99850dd5f110e@gmail.com","Merge origin/master\n\nConflicts:\n\tapplication/controllers/change_form.php","chubwa",true],["73121187c7f99e4ebca4a5376237680723c65a55","bf036b0abf3f5dd009416a711ec99850dd5f110e@gmail.com","Merge origin/master\n\nConflicts:\n\tapplication/controllers/accountant_controller.php\n\tapplication/controllers/admin_controller.php\n\tapplication/controllers/general_accountant.php\n\tapplication/controllers/register_controller.php\n\tapplication/models/accountant_model.php\n\tapplication/models/admin_model.php\n\tapplication/views/accountant_diesel.php\n\tapplication/views/accountant_kerosine.php\n\tapplication/views/accountant_oil.php\n\tapplication/views/accountant_overview.php\n\tapplication/views/accountant_overview1.php\n\tapplication/views/accountant_overview2.php\n\tapplication/views/accountant_overview3.php\n\tapplication/views/accountant_view.php\n\tapplication/views/admin_dashbord.php\n\tapplication/views/footer.php\n\tapplication/views/header2.php\n\tapplication/views/petrol_seller_info.php","chubwa",true]],"size":3,"ref":"refs/heads/master","head":"73121187c7f99e4ebca4a5376237680723c65a55"}