23 Mar, 2018

1 commit

• 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

2 commits

• de5c40dd   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  #	app/src/main/res/layout/fragment_mine.xml

  姚旭斌

  2018-03-22 12:30:21 +0800  
• 49d6fe65   no message Browse File »
  陶汉栋

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

08 Mar, 2018

3 commits

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

  2018-03-08 16:37:57 +0800  
• 34c57df7   no message Browse File »
  陶汉栋

  2018-03-08 16:37:07 +0800  
• 2923e797   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse File »
  姚旭斌

  2018-03-08 10:18:23 +0800  

07 Mar, 2018

1 commit

• 180671fd   no message Browse File »
  陶汉栋

  2018-03-07 14:20:16 +0800  

06 Mar, 2018

1 commit

• ce26434c   no message Browse File »
  陶汉栋

  2018-03-06 08:56:35 +0800