GitHub PushEvent at 2014-06-17 15:16:32
Repository: QXH_20140524_XY
Actor: liuzhencai
Payload: {"shas":[["bbf3fba983cebac0e06bb8a7d0a2e1b66d17385c","5c1d19e637815a7ff994a229199682fb394ac137@xueyong.local","部落接口调用","Desktop",true],["1549347823d7063cc9b2cb4612367327976a67a3","5c1d19e637815a7ff994a229199682fb394ac137@xueyong.local","Merge branch 'master' of https://github.com/liuzhencai/QXH_20140524_XY\n\nConflicts:\n\tQXH/AddressListModule/Controller/AddressListViewController.m\n\tQXH/AddressListModule/Controller/NameCardViewController.h\n\tQXH/AddressListModule/Controller/NameCardViewController.m\n\tQXH/AddressListModule/View/MyMessageCell.m\n\tQXH/AddressListModule/View/NameCardTitleCell.m\n\tQXH/AddressListModule/View/PeocelCell.m\n\tQXH/HomePageModule/Controller/CreatTribeViewController.m\n\tQXH/HomePageModule/Controller/MyTribeDetailViewController.h\n\tQXH/HomePageModule/Controller/MyTribeDetailViewController.m\n\tQXH/HomePageModule/Controller/TribeController.m\n\tQXH/HomePageModule/Controller/TribeDetailViewController.m\n\tQXH/HomePageModule/View/MyTribeListCell.m","Desktop",true]],"size":2,"ref":"refs/heads/master","head":"1549347823d7063cc9b2cb4612367327976a67a3"}