GitHub PushEvent at 2014-07-24 09:28:16
Repository: tqh-site
Actor: pengqiuyuan
Payload: {"shas":[["6ccebb3b30d9f5c70f8b466ab2e7fb9e4b38d1b8","55cb2493d8284845c45da58cb83296ce473f3058@gmail.com","1、直播间初步完成\n2、bug无效 $('#chatOffHistory').scrollTop(chatOffHistory.scrollHeight);","pengqiuyuan",true],["5ecd532eb9a57d5de06f53393981273674f5bf18","55cb2493d8284845c45da58cb83296ce473f3058@gmail.com","Merge remote-tracking branch 'origin/dev' into dev\n\nConflicts:\n\tsrc/main/java/com/huake/web/controller/mgr/ChatController.java","pengqiuyuan",true]],"size":2,"ref":"refs/heads/dev","head":"5ecd532eb9a57d5de06f53393981273674f5bf18"}