24 Mar, 2018

3 commits

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

  2018-03-24 10:54:41 +0800  
• 4b52df23   no message Browse File »
  陶汉栋

  2018-03-24 10:25:56 +0800  
• e456fe36   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

  2018-03-24 09:43:47 +0800  

23 Mar, 2018

2 commits

• 7c993489   no message Browse File »
  陶汉栋

  2018-03-23 17:45:24 +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

2 commits

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

  2018-03-22 15:53:45 +0800  
• 432b4257   no message Browse File »
  陶汉栋

  2018-03-22 15:36:10 +0800  

09 Mar, 2018

2 commits

• 59f55e6b   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/res/values/colors.xml

  姚旭斌

  2018-03-09 15:33:28 +0800  
• 5ade1fb7   no message Browse File »
  陶汉栋

  2018-03-09 13:15:15 +0800