{"push_id":2679803439,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8d420c2059133a8e74331445c92e485bf5598691","before":"db6f54804e612d278570d755153a05169541a6c4","commits":[{"sha":"8d420c2059133a8e74331445c92e485bf5598691","author":{"name":"xyzstemr","email":"04f35feaa9651a854b1ffb30100f5165749d3e0f@163.com"},"message":"Merge branch 'master' of https://github.com/Gitjiangwei/Ageless\n\n# Conflicts:\n#\tpom.xml\n#\tsrc/main/java/com/ageless/controller/AddressController.java\n#\tsrc/main/java/com/ageless/controller/UserController.java\n#\tsrc/main/java/com/ageless/mapper/AddressMapper.java\n#\tsrc/main/java/com/ageless/mapper/UserMapper.java\n#\tsrc/main/java/com/ageless/service/AddressService.java\n#\tsrc/main/java/com/ageless/service/UserService.java\n#\tsrc/main/java/com/ageless/service/impl/AddressServiceImpl.java\n#\tsrc/main/java/com/ageless/service/impl/UserServiceImpl.java\n#\tsrc/main/java/com/ageless/util/MD5.java\n#\tsrc/main/resources/application.properties\n#\tsrc/main/resources/mapper/AddressMapper.xml\n#\tsrc/main/resources/mapper/UserMapper.xml\n#\tsrc/main/resources/static/js/login.js\n#\tsrc/main/resources/static/js/udai_address.js\n#\tsrc/main/resources/templates/login.html\n#\tsrc/main/resources/templates/udai_address.html\n#\tsrc/main/resources/templates/udai_setting.html","distinct":true,"url":"https://api.github.com/repos/Gitjiangwei/Ageless/commits/8d420c2059133a8e74331445c92e485bf5598691"}]}
{"actor":{"display_login":"xyzstemr"}}