26 Mar, 2018

7 commits

• 38b93710   no message Browse Dir »
  陶汉栋

  2018-03-26 13:07:21 +0800  
• ab99c955   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

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

  2018-03-26 10:20:17 +0800  
• 6648d446   no message Browse Dir »
  姚旭斌

  2018-03-26 10:19:59 +0800  
• 325cb7bb   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-26 10:17:23 +0800  
• 8c9c3f09   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  张道锋

  2018-03-26 10:08:18 +0800  
• a4ba63a7   no message Browse Dir »
  张道锋

  2018-03-26 10:07:59 +0800  

24 Mar, 2018

33 commits

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

  2018-03-24 18:04:08 +0800  
• 174e70cd   no message Browse Dir »
  姚旭斌

  2018-03-24 18:03:54 +0800  
• 73227804   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-24 17:43:58 +0800  
• 05d042d9   no message Browse Dir »
  陶汉栋

  2018-03-24 17:43:35 +0800  
• 5a577c2a   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml
  #	app/src/main/res/layout/activity_personinfo.xml
  #	app/src/main/res/layout/fragment_mine.xml

  姚旭斌

  2018-03-24 17:42:54 +0800  
• f6c9454a   no message Browse Dir »
  姚旭斌

  2018-03-24 17:41:36 +0800  
• b5c21103   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java

  姚旭斌

  2018-03-24 17:32:14 +0800  
• 8afee2bd   no message Browse Dir »
  姚旭斌

  2018-03-24 17:31:29 +0800  
• ca2029b2   no message Browse Dir »
  陶汉栋

  2018-03-24 17:18:37 +0800  
• 7b8a96d8   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-24 17:05:14 +0800  
• 85477cb5   no message Browse Dir »
  陶汉栋

  2018-03-24 17:04:57 +0800  
• 38c88362   no message Browse Dir »
  姚旭斌

  2018-03-24 17:01:41 +0800  
• e92104a6   no message Browse Dir »
  姚旭斌

  2018-03-24 16:19:30 +0800  
• fa55eab0   no message Browse Dir »
  姚旭斌

  2018-03-24 16:18:55 +0800  
• b4a2cc26   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  姚旭斌

  2018-03-24 14:54:44 +0800  
• d4f3a486   no message Browse Dir »
  姚旭斌

  2018-03-24 14:54:32 +0800  
• 22a74751   no message Browse Dir »
  姚旭斌

  2018-03-24 12:33:28 +0800  
• ce0a88ea   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-24 11:33:52 +0800  
• 34523b04   no message Browse Dir »
  陶汉栋

  2018-03-24 11:33:46 +0800  
• 3808bda7   no message Browse Dir »
  姚旭斌

  2018-03-24 11:30:48 +0800  
• 066e39d8   no message Browse Dir »
  姚旭斌

  2018-03-24 11:29:19 +0800  
• 88c7d7d2   no message Browse Dir »
  陶汉栋

  2018-03-24 11:15:17 +0800  
• 011cb910   no message Browse Dir »
  姚旭斌

  2018-03-24 11:14:40 +0800  
• 384118a2   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-24 11:05:02 +0800  
• a5bec9bb   no message Browse Dir »
  陶汉栋

  2018-03-24 11:04:07 +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