GitHub PushEvent at 2014-04-18 13:20:01
Repository: geekway
Actor: liqian008
Payload: {"shas":[["f5e3be4a4ca18a306804d44f92b4adac0b6f5076","d6ae4bc21cfd815f7e08a6192e8a30a98e7d0a7c@no5media.com","自定义菜单","liqian",true],["bf49796f61c801e204eb4b9dbbfbf74d5864037d","d6ae4bc21cfd815f7e08a6192e8a30a98e7d0a7c@no5media.com","Merge branch 'master' of https://github.com/liqian008/geekway.git\n\nConflicts:\n\tgeekway-admin/src/main/webapp/WEB-INF/jsp/mp/menuList.jsp","liqian",true]],"size":2,"ref":"refs/heads/master","head":"bf49796f61c801e204eb4b9dbbfbf74d5864037d"}