GitHub PushEvent at 2014-11-12 09:42:19
Repository: NotificationDemo
Actor: zhangjianembedded
Payload: {"shas":[["0f7a6fc0ebbcc075ec6086e75faf13fe14b2bc49","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","AAA","zhangjian",false],["a80089414f80d7d63934ea9363faafd7abee7e8e","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","CCCCCCC","zhangjian",false],["b3c12f3a3403a75c074523458d02459ff46abc55","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","Merge branch 'dev' of\nhttps://github.com/zhangjianembedded/NotificationDemo.git into dev\n\nConflicts:\n\tsrc/com/example/notificationdemo/ThirdActivity.java","zhangjian",false],["4186c9845f3f79626ac1f9a98bfdc9e66a81be78","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","解决bug1","zhangjian",false],["588ae87f9b6a56fbaf57e41b163272d83b9d3f17","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","Merge branch 'bug1' into dev\n\nConflicts:\n\tsrc/com/example/notificationdemo/ThirdActivity.java","zhangjian",false],["76c65d35a3da97b17d30ff34d0ba8a775e4b3852","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","ok","zhangjian",false],["8e6b082545e6bb90823ca6d2aab742795399d12a","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","fix bug2","zhangjian",false],["2b5cbba1b5a6d6e4716cbee73342a7f3f2ff4aa1","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","Merge branch 'bug2' into dev","zhangjian",false],["b4028ac5d1986959cae47261de919be3756d8998","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","第三个啦","zhangjian",false],["5e3400e18f63a8031672a68a0a5630ac3b1fe46a","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","AAAA","zhangjian",false],["e25831bb031388a65280a33fccd4cc91d3d99db6","3e1eaf0f445d04ca91044e0f34dce90a08c9553a@qq.com","Merge branch 'dev'\n\nConflicts:\n\tsrc/com/example/notificationdemo/ThirdActivity.java","zhangjian",true]],"size":11,"ref":"refs/heads/master","head":"e25831bb031388a65280a33fccd4cc91d3d99db6"}