GitHub PushEvent at 2014-12-02 17:24:02
Repository: Firestorm
Actor: manusolito
Payload: {"shas":[["59d49b82a720433dd5f85a5410eef170c212bdab","2595cf2ee3772a7bd110fed0cb58cb56716b5583@gmail.com","Usua","Manu",true],["ef79f6c858fd5a51cc79359778a037c42f659fe0","2595cf2ee3772a7bd110fed0cb58cb56716b5583@gmail.com","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tapp/views/oferta/index.html.erb","Manu",true]],"size":2,"ref":"refs/heads/master","head":"ef79f6c858fd5a51cc79359778a037c42f659fe0"}