GitHub PushEvent at 2014-05-03 01:31:27
Repository: is2_git
Actor: mdrm016
Payload: {"shas":[["0c6bb5aa9482d62c90b62ba00eede1fc3e73ef01","62f0136bea9240760b1fc7f5668f1a6c03d0e23b@mdrm016","Cambios de template y restricciones de atributo de los items","mdrm016",true],["a048d75b8330eb0862dde8801073d3be4eb15956","62f0136bea9240760b1fc7f5668f1a6c03d0e23b@mdrm016","Merge branch 'master' of ssh://git@github.com/mdrm016/is2_git.git\n\nConflicts:\n\tsap/aplicaciones/items/models.pyc\n\tsap/aplicaciones/items/views.py\n\tsap/aplicaciones/tipoatributo/models.pyc\n\tsap/aplicaciones/tipoatributo/views.py\n\tsap/templates/items/cargaratributos.html","mdrm016",true]],"size":2,"ref":"refs/heads/master","head":"a048d75b8330eb0862dde8801073d3be4eb15956"}