{"push_id":553894990,"size":18,"distinct_size":18,"ref":"refs/heads/master","head":"c91481619987280bfd17bdb3910494d0e33c6136","before":"672964044c45c28756322acea0657785adac7562","commits":[{"sha":"06f782675592990770d94e16955a511cc8417a16","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"romoAlmudena"},"message":"Merge pull request #3 from RobertoGS/master\n\nFalta modify Activity","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/06f782675592990770d94e16955a511cc8417a16"},{"sha":"3ec4a2776dfbaff04997c3ff62e9cdf23f059600","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"activities and CompetenceStatus fixed\nRemoved terms.jsp","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/3ec4a2776dfbaff04997c3ff62e9cdf23f059600"},{"sha":"954dbad27d2fa8f8e466d2c0193b7b5ce416791f","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"Merge branch 'master' of github.com:romoAlmudena/tfg\n\n# Via romoAlmudena\n* 'master' of github.com:romoAlmudena/tfg:","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/954dbad27d2fa8f8e466d2c0193b7b5ce416791f"},{"sha":"1925d753b7136b01f14b60fd47e64e785111dbb4","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"Tratando de recuperar","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/1925d753b7136b01f14b60fd47e64e785111dbb4"},{"sha":"b5aa71a124ead5c18ed96bf971250272b08580d6","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"Merge branch 'firstPart'\n\n* firstPart:\n  Tratando de recuperar","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/b5aa71a124ead5c18ed96bf971250272b08580d6"},{"sha":"2cbf6f8f1df1367de254e6d0839b832aa8e5941d","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"Lo mismo que antes","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/2cbf6f8f1df1367de254e6d0839b832aa8e5941d"},{"sha":"61e1e23b1040ca25512cedb2a565afd4692f6553","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"probando","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/61e1e23b1040ca25512cedb2a565afd4692f6553"},{"sha":"aaee9f1f3ea2976b681b08a982e32a9f3acf8ba3","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"Merge commit '06f782675592990770d94e16955a511cc8417a16' into desarrollo\n\n* commit '06f782675592990770d94e16955a511cc8417a16':","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/aaee9f1f3ea2976b681b08a982e32a9f3acf8ba3"},{"sha":"9244e313a9c688342aeb659081a14a9d4bdd4b2d","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"Solucionado pequeños bugs.","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/9244e313a9c688342aeb659081a14a9d4bdd4b2d"},{"sha":"753a6df242a9741df5bafd1887d22a29e5a375f7","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"Merge branch 'desarrollo'\n\n* desarrollo:\n  Solucionado pequeños bugs.\n\nConflicts:\n\tsrc/main/java/com/example/tfg/domain/Course.java\n\ttarget/classes/com/example/tfg/domain/Course.class\n\ttarget/m2e-wtp/web-resources/META-INF/maven/com.example/tfg/pom.properties","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/753a6df242a9741df5bafd1887d22a29e5a375f7"},{"sha":"611bfb2d6b4b3856c65d707eab66715f246c40fa","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"Fixed again","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/611bfb2d6b4b3856c65d707eab66715f246c40fa"},{"sha":"5b4d3219dacde9c60db77862d5f4e07effe2dd32","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"Merge branch 'desarrollo'\n\n* desarrollo:\n  Fixed again","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/5b4d3219dacde9c60db77862d5f4e07effe2dd32"},{"sha":"4e6aa08af129cc81e6329a12f5f944a57faa1c4f","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"commit código almudena","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/4e6aa08af129cc81e6329a12f5f944a57faa1c4f"},{"sha":"6073d73a936b9b6e18280f0f7ea15db28d255530","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"commit prueba","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/6073d73a936b9b6e18280f0f7ea15db28d255530"},{"sha":"ec0770d1cc51ddb846df03b67f6d1320237d7c2a","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Merge commit '5b4d3219dacde9c60db77862d5f4e07effe2dd32'\n\nConflicts:\n\tsrc/main/webapp/WEB-INF/views/activity/modifyChoose.jsp\n\ttarget/classes/com/example/tfg/web/AcademicTermController.class\n\ttarget/m2e-wtp/web-resources/META-INF/maven/com.example/tfg/pom.properties","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/ec0770d1cc51ddb846df03b67f6d1320237d7c2a"},{"sha":"82a35bd8fe596e33840de075024d1b385aff27ab","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Merge branch 'master' into desarrollo\n\nConflicts:\n\ttarget/m2e-wtp/web-resources/META-INF/maven/com.example/tfg/pom.properties","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/82a35bd8fe596e33840de075024d1b385aff27ab"},{"sha":"ea9fa9a07b6b660b8ea34562f41d9c3db39b2324","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Alguna url de redirect corregida.","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/ea9fa9a07b6b660b8ea34562f41d9c3db39b2324"},{"sha":"c91481619987280bfd17bdb3910494d0e33c6136","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Cambio de spring a version 4.1.4.RELEASE.","distinct":true,"url":"https://api.github.com/repos/RobertoGS/tfg/commits/c91481619987280bfd17bdb3910494d0e33c6136"}]}