{"push_id":685626003,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"1c32efca84b06e8b3fa472507e8abe0e4891efc3","before":"d671e56ddde2af56635cd0e2f580cb68c9bc2d81","commits":[{"sha":"cc3c52e4a2631f189f9db4afd874e04bd3bc1c15","author":{"email":"0ce2351f0d2eddb1f7919f6dc91e9a918fa3deff@Cristian","name":"Cristian Cisternas"},"message":"Merge origin/master DESPUES RESOLVER LOS CONFLICTOS TOMEMOS CHELAS XD\n\nConflicts:\n\tapplication/config/database.php\n\tapplication/controllers/controlador.php\n\tapplication/models/modelo.php\n\tapplication/views/content.php\n\tapplication/views/header.php\n\tjs/funciones.js","distinct":true,"url":"https://api.github.com/repos/smartcatltda/machina/commits/cc3c52e4a2631f189f9db4afd874e04bd3bc1c15"},{"sha":"1c32efca84b06e8b3fa472507e8abe0e4891efc3","author":{"email":"0ce2351f0d2eddb1f7919f6dc91e9a918fa3deff@Cristian","name":"Cristian Cisternas"},"message":"Merge origin/master\n\nConflicts:\n\tapplication/models/modelo.php\n\tapplication/views/content.php","distinct":true,"url":"https://api.github.com/repos/smartcatltda/machina/commits/1c32efca84b06e8b3fa472507e8abe0e4891efc3"}]}