24 Mar, 2018

10 commits

• 85477cb5   no message Browse Dir »
  陶汉栋

  2018-03-24 17:04:57 +0800  
• 34523b04   no message Browse Dir »
  陶汉栋

  2018-03-24 11:33:46 +0800  
• aa386a0f   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-24 10:54:41 +0800  
• 70b2f9e0   no message Browse Dir »
  陶汉栋

  2018-03-24 10:52:43 +0800  
• ee59e97d   no message Browse Dir »
  姚旭斌

  2018-03-24 10:26:53 +0800  
• 3305740f   no message Browse Dir »
  陶汉栋

  2018-03-24 10:26:30 +0800  
• 4b52df23   no message Browse Dir »
  陶汉栋

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

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

  2018-03-24 09:43:47 +0800  
• 8d78127a   no message Browse Dir »
  姚旭斌

  2018-03-24 09:43:02 +0800  
• 0abe9fd6   no message Browse Dir »
  陶汉栋

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

23 Mar, 2018

10 commits

• 257465ea   no message Browse Dir »
  陶汉栋

  2018-03-23 17:46:50 +0800  
• 7c993489   no message Browse Dir »
  陶汉栋

  2018-03-23 17:45:24 +0800  
• 8176e156   no message Browse Dir »
  陶汉栋

  2018-03-23 16:47:02 +0800  
• bec10697   no message Browse Dir »
  姚旭斌

  2018-03-23 16:15:54 +0800  
• c5aac4c3   no message Browse Dir »
  陶汉栋

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

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

  张道锋

  2018-03-23 16:03:39 +0800  
• d878d22f   no message Browse Dir »
  陶汉栋

  2018-03-23 16:03:37 +0800  
• e56d2f35   no message Browse Dir »
  姚旭斌

  2018-03-23 15:55:12 +0800  
• 4065e67b   no message Browse Dir »
  姚旭斌

  2018-03-23 15:37:40 +0800  
• 1812a131   no message Browse Dir »
  姚旭斌

  2018-03-23 09:37:54 +0800  

22 Mar, 2018

11 commits

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

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

  2018-03-22 16:51:54 +0800  
• 05344cfa   no message Browse Dir »
  陶汉栋

  2018-03-22 16:29:00 +0800  
• 57dfbdb6   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

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

  2018-03-22 15:36:10 +0800  
• de5c40dd   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # 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 Dir »
  陶汉栋

  2018-03-22 11:39:15 +0800  
• 2a83582a   no message Browse Dir »
  姚旭斌

  2018-03-22 11:37:04 +0800  
• 50ca3597   no message Browse Dir »
  张道锋

  2018-03-22 11:06:39 +0800  
• 7fa6a0f8   no message Browse Dir »
  姚旭斌

  2018-03-22 09:52:12 +0800  
• 9b095404   no message Browse Dir »
  陶汉栋

  2018-03-22 09:51:22 +0800  

21 Mar, 2018

5 commits

• 3909048b   no message Browse Dir »
  姚旭斌

  2018-03-21 17:03:10 +0800  
• fbd004dd   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-21 16:41:47 +0800  
• 2f0e5240   no message Browse Dir »
  陶汉栋

  2018-03-21 15:45:26 +0800  
• ec30fab4   no message Browse Dir »
  陶汉栋

  2018-03-21 15:43:34 +0800  
• d7705ead   no message Browse Dir »
  姚旭斌

  2018-03-21 15:26:40 +0800  

20 Mar, 2018

4 commits

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

  2018-03-20 17:55:33 +0800  
• b8de588f   no message Browse Dir »
  姚旭斌

  2018-03-20 17:48:04 +0800  
• 9ffe80e9   no message Browse Dir »
  陶汉栋

  2018-03-20 17:33:35 +0800  
• 9ef200d2   no message Browse Dir »
  陶汉栋

  2018-03-20 17:26:09 +0800