23 Mar, 2018

2 commits

• 8176e156   no message Browse File »
  陶汉栋

  2018-03-23 16:47:02 +0800  
• ec9c6c5d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

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

  张道锋

  2018-03-23 16:03:39 +0800  

22 Mar, 2018

3 commits

• ee0f03b1   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-22 18:17:38 +0800  
• cc9bfb52   no message Browse File »
  陶汉栋

  2018-03-22 18:08:54 +0800  
• 50ca3597   no message Browse File »
  张道锋

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

21 Mar, 2018

4 commits

• d045d156   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-21 15:26:55 +0800  
• 8c263840   no message Browse File »
  陶汉栋

  2018-03-21 14:42:38 +0800  
• 561e50fc   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-21 09:52:55 +0800  
• 10a30b8e   no message Browse File »
  姚旭斌

  2018-03-21 09:23:27 +0800  

20 Mar, 2018

1 commit

• 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

• e2485424   no message Browse File »
  姚旭斌

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

15 Mar, 2018

2 commits

• 02c439f8   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse File »
  姚旭斌

  2018-03-15 09:50:52 +0800  
• b8d5d471   no message Browse File »
  陶汉栋

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