{"push_id":543572246,"size":8,"distinct_size":1,"ref":"refs/heads/Arkaitz","head":"3ec5739ea5a635ab6d46abf135300552ee2b7c60","before":"93a1391938a1369a9bf3bf86176d4d28700a3d78","commits":[{"sha":"5311fcfaa700ddcea8af1c1dfe331c7fe32743e8","author":{"email":"3b1753fb162d12e74936dcf39a0d6d7968fc1d11@gmail.com","name":"Nadox"},"message":"Carga toros y cabestros de la base de datos y controla que elijas uno de\nlos dos para que no de excepcion a la hora de añadir, eliminar o\nmodificar.\n\nFalta implementar los botones de eliminar, añadir y modificar.","distinct":false,"url":"https://api.github.com/repos/aserrano011/ADSI2014/commits/5311fcfaa700ddcea8af1c1dfe331c7fe32743e8"},{"sha":"e1b6030d6e8ae1453032b6539a56fa3c67a29fa2","author":{"email":"3b1753fb162d12e74936dcf39a0d6d7968fc1d11@gmail.com","name":"Nadox"},"message":"Clases Toro y Cabestros añadidas","distinct":false,"url":"https://api.github.com/repos/aserrano011/ADSI2014/commits/e1b6030d6e8ae1453032b6539a56fa3c67a29fa2"},{"sha":"312bd584ad912be937d8454728d12911e3f7f987","author":{"email":"3b1753fb162d12e74936dcf39a0d6d7968fc1d11@gmail.com","name":"Nadox"},"message":"Nueva clase animal que toma los valores principales de toro y cabestro y\nes abstracta para modificar los metodos de estos.\nBoton de añadir y eliminar implementados, falta modificar.","distinct":false,"url":"https://api.github.com/repos/aserrano011/ADSI2014/commits/312bd584ad912be937d8454728d12911e3f7f987"},{"sha":"e55b9823cfd3a1db9e0e48d56cbb58bf209a2cac","author":{"email":"3b1753fb162d12e74936dcf39a0d6d7968fc1d11@gmail.com","name":"Nadox"},"message":"Merge branch 'Endika2'","distinct":false,"url":"https://api.github.com/repos/aserrano011/ADSI2014/commits/e55b9823cfd3a1db9e0e48d56cbb58bf209a2cac"},{"sha":"9a86523f884443d71a2309d24db00fbc6999b816","author":{"email":"3b1753fb162d12e74936dcf39a0d6d7968fc1d11@gmail.com","name":"Nadox"},"message":"Principal cambiado","distinct":false,"url":"https://api.github.com/repos/aserrano011/ADSI2014/commits/9a86523f884443d71a2309d24db00fbc6999b816"},{"sha":"30a977b0784b799008ec2fa0cd6f7300c9eb8548","author":{"email":"3b1753fb162d12e74936dcf39a0d6d7968fc1d11@gmail.com","name":"Nadox"},"message":"Arreglo fallos por conflicto -.-","distinct":false,"url":"https://api.github.com/repos/aserrano011/ADSI2014/commits/30a977b0784b799008ec2fa0cd6f7300c9eb8548"},{"sha":"306566e1358c3ebafe14ccfb4d9b67e22db12056","author":{"email":"3b1753fb162d12e74936dcf39a0d6d7968fc1d11@gmail.com","name":"Nadox"},"message":"Todo funcional, ni errores, ni saltan excepciones ni nada","distinct":false,"url":"https://api.github.com/repos/aserrano011/ADSI2014/commits/306566e1358c3ebafe14ccfb4d9b67e22db12056"},{"sha":"3ec5739ea5a635ab6d46abf135300552ee2b7c60","author":{"email":"08c6f61541b16aeaa98cb74054ff84b270353bd1@192.168.1.129","name":"MAGNUM"},"message":"Merge branch 'master' into Arkaitz","distinct":true,"url":"https://api.github.com/repos/aserrano011/ADSI2014/commits/3ec5739ea5a635ab6d46abf135300552ee2b7c60"}]}