{"push_id":1099546601,"size":6,"distinct_size":6,"ref":"refs/heads/master","head":"96aeb5d9d44f838765656c31769949b41539be3c","before":"28d03238cdc043f0be3b39a24cb0d8b19d16ed00","commits":[{"sha":"b951ea82d33bf378e753d938895f0199d06ec3fb","author":{"email":"92533a7bebd3e26ee0f8af95f1b213df781bf0f9@salleurl.edu","name":"vandernick"},"message":"classe canso","distinct":true,"url":"https://api.github.com/repos/ivangice/Espotyfai/commits/b951ea82d33bf378e753d938895f0199d06ec3fb"},{"sha":"77ed3ab83640bc8a16bdba01ba7bd494a74f62c1","author":{"email":"92533a7bebd3e26ee0f8af95f1b213df781bf0f9@salleurl.edu","name":"vandernick"},"message":"Merge branch 'master' of https://github.com/ivangice/Espotyfai","distinct":true,"url":"https://api.github.com/repos/ivangice/Espotyfai/commits/77ed3ab83640bc8a16bdba01ba7bd494a74f62c1"},{"sha":"b223384a8304784dc549af2dd4f4926ec1022d9e","author":{"email":"92533a7bebd3e26ee0f8af95f1b213df781bf0f9@salleurl.edu","name":"vandernick"},"message":"calsse canso","distinct":true,"url":"https://api.github.com/repos/ivangice/Espotyfai/commits/b223384a8304784dc549af2dd4f4926ec1022d9e"},{"sha":"e221c94359b374b864e9eab48e7085ca7c9b4b2b","author":{"email":"92533a7bebd3e26ee0f8af95f1b213df781bf0f9@salleurl.edu","name":"vandernick"},"message":"afegida un metode a ManageUsers i canviades les classes Canso i Llista","distinct":true,"url":"https://api.github.com/repos/ivangice/Espotyfai/commits/e221c94359b374b864e9eab48e7085ca7c9b4b2b"},{"sha":"b5e8fb9da3641daf6c02ab0d818d3bdcfc1cbd78","author":{"email":"92533a7bebd3e26ee0f8af95f1b213df781bf0f9@salleurl.edu","name":"vandernick"},"message":"premerge","distinct":true,"url":"https://api.github.com/repos/ivangice/Espotyfai/commits/b5e8fb9da3641daf6c02ab0d818d3bdcfc1cbd78"},{"sha":"96aeb5d9d44f838765656c31769949b41539be3c","author":{"email":"92533a7bebd3e26ee0f8af95f1b213df781bf0f9@salleurl.edu","name":"vandernick"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\teSpotifai_Client/bin/network/UserService.class\n\teSpotifai_Client/src/controller/ButtonController.java\n\teSpotifai_Client/src/model/Canso.java\n\teSpotifai_Client/src/network/UserService.java\n\teSpotifai_Servidor/bin/db/ManageUsers.class\n\teSpotifai_Servidor/bin/model/Llista.class\n\teSpotifai_Servidor/src/db/ManageUsers.java\n\teSpotifai_Servidor/src/model/Canso.java\n\teSpotifai_Servidor/src/model/Llista.java","distinct":true,"url":"https://api.github.com/repos/ivangice/Espotyfai/commits/96aeb5d9d44f838765656c31769949b41539be3c"}]}