{"push_id":1212838661,"size":14,"distinct_size":14,"ref":"refs/heads/master","head":"09dfbc9a8c76cf40e9872d95712e67f528425b7c","before":"6f9d3055c9f4636bd733fd17525e417aed81bce7","commits":[{"sha":"686812f2fa155026a314c54a77ec78005d277a62","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge branch 'master' of E:\\git1\\tarot with conflicts.","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/686812f2fa155026a314c54a77ec78005d277a62"},{"sha":"e9d1c3ca1e97a7e932e7229279da1f6131079664","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/e9d1c3ca1e97a7e932e7229279da1f6131079664"},{"sha":"32a3f074cc17f57f5116f23e33a1f6a32d77c3f6","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/32a3f074cc17f57f5116f23e33a1f6a32d77c3f6"},{"sha":"14ec3b3092d889d0f75cd152bcfad503fdb7cc7f","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\twebsite/tarot-home/src/main/profiles/prd/database.properties","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/14ec3b3092d889d0f75cd152bcfad503fdb7cc7f"},{"sha":"518a6211b54215f87877c1c44a54c46677b329d0","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/518a6211b54215f87877c1c44a54c46677b329d0"},{"sha":"2ca3ad2f28e44d64a2298f1b76c9393315ddaf7f","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/2ca3ad2f28e44d64a2298f1b76c9393315ddaf7f"},{"sha":"4f553952961731921973e458b082c007a276f856","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/4f553952961731921973e458b082c007a276f856"},{"sha":"d7530d941d037ca5e6662c246f2f2f7308b8c6e8","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/d7530d941d037ca5e6662c246f2f2f7308b8c6e8"},{"sha":"c06a8ef0ac281d2bcecbee945d44b6648ca02cb2","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/c06a8ef0ac281d2bcecbee945d44b6648ca02cb2"},{"sha":"21d49bfc3cd4005b570bd869cfbdc1b57943c5f3","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/21d49bfc3cd4005b570bd869cfbdc1b57943c5f3"},{"sha":"4fc16cc249ae36ac660148b136289f78bdbaddea","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"package重构","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/4fc16cc249ae36ac660148b136289f78bdbaddea"},{"sha":"c7d177fd6c30835d5b687080aa4b6b1d2a359b04","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"前端查询过滤参数。","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/c7d177fd6c30835d5b687080aa4b6b1d2a359b04"},{"sha":"99562942415add9bd153f0a58a55cab1f3628e07","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"合并css、js目录到plugins目录中。\n去除没有用的插件datatables、ui-grid等。\n升级uib到2.0.0。","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/99562942415add9bd153f0a58a55cab1f3628e07"},{"sha":"09dfbc9a8c76cf40e9872d95712e67f528425b7c","author":{"name":"martin","email":"0262c90c771937c209fd2813083cc0f4b18aab80@clever-m.com"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\twebsite/tarot-home/src/main/java/com/myee/tarot/web/admin/controller/merchant/MerchantController.java","distinct":true,"url":"https://api.github.com/repos/bulong0721/tarot/commits/09dfbc9a8c76cf40e9872d95712e67f528425b7c"}]}
{"actor":{"display_login":"bulong0721"}}