GitHub PushEvent at 2014-12-17 11:15:55
Repository: tsinghuatuan
Actor: THU-wyw
Payload: {"shas":[["d57bf20b0bf7bdbbea48e062ab1159fa78e33372","34ff0b0d70a7d4e01686d3b9d9913f009b3e847d@gmail.com","完成袁扬姐姐的各项吩咐","THU-wyw",true],["983ec6a46aa163da949f4aebb16b30c379d6faad","34ff0b0d70a7d4e01686d3b9d9913f009b3e847d@gmail.com","Merge branch 'master' of https://github.com/BugFreeSE/tsinghuatuan\n\nConflicts:\n\turlhandler/userpage/static1/js/activity.js","THU-wyw",true],["dc528a7c4e4931964da86a74a93e38a17e2f124b","34ff0b0d70a7d4e01686d3b9d9913f009b3e847d@gmail.com","将activity.js文件合并至app.js中","THU-wyw",true]],"size":3,"ref":"refs/heads/master","head":"dc528a7c4e4931964da86a74a93e38a17e2f124b"}