29 Mar, 2018

1 commit

• 762b1b1d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  张道锋

  2018-03-29 18:09:40 +0800  

28 Mar, 2018

2 commits

• 0cbfbb68   no message Browse File »
  陶汉栋

  2018-03-28 19:37:03 +0800  
• 62be613c   no message Browse File »
  姚旭斌

  2018-03-28 19:35:03 +0800  

22 Mar, 2018

1 commit

• 50ca3597   no message Browse File »
  张道锋

  2018-03-22 11:06:39 +0800  

20 Mar, 2018

5 commits

• 6a922153   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-20 14:40:50 +0800  
• e80f1b4f   no message Browse File »
  姚旭斌

  2018-03-20 13:59:31 +0800  
• 69e40270   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-20 11:32:10 +0800  
• 9e6ee8e8   no message Browse File »
  陶汉栋

  2018-03-20 11:23:21 +0800  
• b8df71fe   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

  # Conflicts:
  #	.idea/modules.xml
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java

  陶汉栋

  2018-03-20 08:29:22 +0800  

19 Mar, 2018

1 commit

• e71dbb40   no message Browse File »
  姚旭斌

  2018-03-19 17:29:45 +0800  

17 Mar, 2018

1 commit

• c84d485d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml

  张道锋

  2018-03-17 17:34:49 +0800  

16 Mar, 2018

2 commits

• b181dda4   no message Browse File »
  陶汉栋

  2018-03-16 13:45:20 +0800  
• a97b79d9   no message Browse File »
  姚旭斌

  2018-03-16 13:42:44 +0800  

15 Mar, 2018

1 commit

• 3163a156   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-15 08:20:51 +0800  

14 Mar, 2018

1 commit

• 8c991655   no message Browse File »
  姚旭斌

  2018-03-14 20:56:02 +0800  

09 Mar, 2018

6 commits

• 8e86a2dc   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-09 17:09:06 +0800  
• 751075af   no message Browse File »
  姚旭斌

  2018-03-09 16:50:12 +0800  
• 217deceb   no message Browse File »
  陶汉栋

  2018-03-09 16:47:59 +0800  
• 1ff66eb6   no message Browse File »
  姚旭斌

  2018-03-09 15:31:10 +0800  
• 02540182   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-09 13:15:26 +0800  
• 50891b90   no message Browse File »
  姚旭斌

  2018-03-09 11:15:32 +0800