GitHub PushEvent at 2014-04-27 07:49:55
Repository: tvsunnah
Actor: nikyusof
Payload: {"shas":[["85a43d8213fad7b49027074892c7c8196c84d335","a5da1df52fbd4bae5a58f2a09aa5454a4030bcea@bu.edu","Delete All","nikyusof",true],["47d7d7eec04255d1ae8e6755e30ef64854e23cbc","a5da1df52fbd4bae5a58f2a09aa5454a4030bcea@bu.edu","No idea","nikyusof",true],["768a1d75ea9f6441d02c161ec7e2324b380a3f4f","a5da1df52fbd4bae5a58f2a09aa5454a4030bcea@bu.edu","Merge branch 'master' of https://github.com/nikyusof/tvsunnah\n\nConflicts:\n\t.gitignore\n\t.project\n\t.target/assets/javascripts/app.js\n\t.target/assets/javascripts/collections/MenuCollection.js\n\t.target/assets/javascripts/collections/ResourceCollection.js\n\t.target/assets/javascripts/controllers/AlertController.js\n\t.target/assets/javascripts/controllers/ContactController.js\n\t.target/assets/javascripts/controllers/MenuController.js\n\t.target/assets/javascripts/controllers/ResetPassword1Controller.js\n\t.target/assets/javascripts/controllers/ResourceController.js\n\t.target/assets/javascripts/controllers/StaticController.js\n\t.target/assets/javascripts/controllers/UserController.js\n\t.target/assets/javascripts/controllers/baseController.js\n\t.target/assets/javascripts/helpers/RoutingHelper.js\n\t.target/assets/javascripts/helpers/jquery.quick.pagination.js\n\t.target/assets/javascripts/main.js\n\t.target/assets/javascripts/models/ContactModel.js\n\t.target/assets/javascripts/models/MenuModel.js\n\t.target/assets/javascripts/models/ResetPassword1Model.js\n\t.target/assets/javascripts/models/UserModel.js\n\t.target/assets/javascripts/router.js\n\t.target/assets/javascripts/views/AlertView.js\n\t.target/assets/javascripts/views/ContactView.js\n\t.target/assets/javascripts/views/MenuView.js\n\t.target/assets/javascripts/views/RegistrationView.js\n\t.target/assets/javascripts/views/ResetPassword1View.js\n\t.target/assets/javascripts/views/ResourceView.js\n\t.target/assets/javascripts/views/StaticView.js\n\t.target/assets/javascripts/views/UserView.js\n\t.target/assets/javascripts/views/baseView.js\n\t.target/views/contactus.scala.html\n\t.target/views/resetpassword1.scala.html\n\tapp/Global.java\n\tapp/assets/javascripts/controllers/RecipientController.js\n\tapp/assets/javascripts/controllers/ResourceController.js\n\tapp/assets/javascripts/models/ResetPassword1Model.js\n\tapp/assets/javascripts/models/ResourceModel.js\n\tapp/assets/javascripts/models/UserModel.js\n\tapp/assets/javascripts/views/RecipientView.js\n\tapp/assets/javascripts/views/RegistrationView.js\n\tapp/assets/javascripts/views/ResetPassword1View.js\n\tapp/assets/javascripts/views/ResetPassword2View.js\n\tapp/assets/javascripts/views/ResourceView.js\n\tapp/assets/stylesheets/main.less\n\tapp/controllers/ContactController.java\n\tapp/controllers/RecipientController.java\n\tapp/controllers/ResourceController.java\n\tapp/controllers/UserController.java\n\tapp/models/Address.java\n\tapp/models/Resource.java\n\tapp/models/User.java\n\tapp/views/address.scala.html\n\tapp/views/recipient.scala.html\n\tapp/views/resource.scala.html\n\tbuild-templates.bat\n\tconf/application.conf\n\tconf/evolutions/default/1.sql\n\tconf/routes\n\tconf/testdata.json\n\tpublic/javascripts/compiled-partials.js\n\tpublic/javascripts/compiled-templates.js\n\tpublic/templates/main/recipient-template.hbs\n\tpublic/templates/main/resource-mapwindow-template.hbs\n\tpublic/templates/main/resource-template.hbs\n\tpublic/templates/partials/resource-list-template.hbs\n\ttest/models/ResourceTest.java\n\ttest/models/UserTest.java","nikyusof",true]],"size":3,"ref":"refs/heads/master","head":"768a1d75ea9f6441d02c161ec7e2324b380a3f4f"}