22 Mar, 2018

1 commit

• 50ca3597   no message Browse Dir »
  张道锋

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

19 Mar, 2018

1 commit

• 2c964317   no message Browse Dir »
  陶汉栋

  2018-03-19 18:31:11 +0800  

17 Mar, 2018

1 commit

• c84d485d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »

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

  张道锋

  2018-03-17 17:34:49 +0800  

16 Mar, 2018

4 commits

• b9b5e32e   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java

  姚旭斌

  2018-03-16 17:47:29 +0800  
• bfc68ef2   no message Browse Dir »
  陶汉栋

  2018-03-16 17:28:06 +0800  
• ad89d180   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/AppConfig.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java

  姚旭斌

  2018-03-16 17:17:57 +0800  
• 378663ec   no message Browse Dir »
  陶汉栋

  2018-03-16 13:29:22 +0800  

14 Mar, 2018

2 commits

• 26d3505e   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-14 17:04:29 +0800  
• 75be5d9a   no message Browse Dir »
  陶汉栋

  2018-03-14 16:49:37 +0800