{"push_id":616398448,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"327cbdb162c30be1a60f11faa4b272a2ac49ebc6","before":"0451d63f7619a6f9f03d1f0061fb788757a64e26","commits":[{"sha":"c33e508f1c7a6a0463304b5bb11823d585d78326","author":{"email":"b9dea295ed8d7ebd6c93d4bab1db4e1f30459fae@gmail.com","name":"Juan Manuel Baracat"},"message":"Añade la funcionalidad basica de la base de datos.\n\nSe cambia a publica la herencia de Persistible en las clases\nUsuario y Conversacion para poder utilizar su funcionalidad.","distinct":true,"url":"https://api.github.com/repos/matiduarte/taller2-mensajeroX/commits/c33e508f1c7a6a0463304b5bb11823d585d78326"},{"sha":"327cbdb162c30be1a60f11faa4b272a2ac49ebc6","author":{"email":"b9dea295ed8d7ebd6c93d4bab1db4e1f30459fae@gmail.com","name":"Juan Manuel Baracat"},"message":"Merge branch 'master' of https://github.com/matiduarte/taller2-mensajeroX\n\nConflicts:\n\tServidor/main.cpp\n\tServidor/src/Entidades/Usuario.cpp\n\tServidor/src/constantes.h","distinct":true,"url":"https://api.github.com/repos/matiduarte/taller2-mensajeroX/commits/327cbdb162c30be1a60f11faa4b272a2ac49ebc6"}]}