29 Mar, 2018

4 commits

• 762b1b1d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  张道锋

  2018-03-29 18:09:40 +0800  
• 1612af77   no message Browse Code »
  张道锋

  2018-03-29 18:09:36 +0800  
• e280dc61   no message Browse Code »
  陶汉栋

  2018-03-29 14:07:01 +0800  
• 1dffc346   no message Browse Code »
  陶汉栋

  2018-03-29 09:32:39 +0800  

28 Mar, 2018

4 commits

• 0cbfbb68   no message Browse Code »
  陶汉栋

  2018-03-28 19:37:03 +0800  
• 47a38b09   no message Browse Code »
  陶汉栋

  2018-03-28 19:36:02 +0800  
• 62be613c   no message Browse Code »
  姚旭斌

  2018-03-28 19:35:03 +0800  
• f172a56a   no message Browse Code »
  张道锋

  2018-03-28 18:06:22 +0800  

27 Mar, 2018

5 commits

• 384bd868   no message Browse Code »
  张道锋

  2018-03-27 17:09:48 +0800  
• e60e729f   no message Browse Code »
  张道锋

  2018-03-27 16:54:23 +0800  
• 4f854ee0   no message Browse Code »
  张道锋

  2018-03-27 16:54:18 +0800  
• d96a7aeb   no message Browse Code »
  张道锋

  2018-03-27 16:50:11 +0800  
• 92beb983   no message Browse Code »
  陶汉栋

  2018-03-27 10:59:29 +0800  

26 Mar, 2018

22 commits

• e18ab61a   no message Browse Code »
  陶汉栋

  2018-03-26 17:52:42 +0800  
• 1dec60d7   no message Browse Code »
  陶汉栋

  2018-03-26 15:34:05 +0800  
• 853d6390   no message Browse Code »
  陶汉栋

  2018-03-26 15:33:00 +0800  
• 99e7abd3   no message Browse Code »
  姚旭斌

  2018-03-26 15:32:56 +0800  
• b641fe18   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-26 15:30:56 +0800  
• 6cc08955   no message Browse Code »
  陶汉栋

  2018-03-26 15:30:51 +0800  
• 1ff2fc66   Merge branch 'developer' into yxb_dev Browse Code »
  姚旭斌

  2018-03-26 15:27:18 +0800  
• b932b573   no message Browse Code »
  姚旭斌

  2018-03-26 15:27:07 +0800  
• 1a085af7   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  张道锋

  2018-03-26 15:25:55 +0800  
• 38a05c04   no message Browse Code »
  张道锋

  2018-03-26 15:25:50 +0800  
• c0619d56   no message Browse Code »
  陶汉栋

  2018-03-26 15:23:32 +0800  
• 7138f165   no message Browse Code »
  陶汉栋

  2018-03-26 13:08:17 +0800  
• 38b93710   no message Browse Code »
  陶汉栋

  2018-03-26 13:07:21 +0800  
• 03d187a4   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  张道锋

  2018-03-26 10:23:41 +0800  
• 78184bb7   no message Browse Code »
  张道锋

  2018-03-26 10:23:30 +0800  
• ab99c955   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-26 10:21:23 +0800  
• 183c91ed   no message Browse Code »
  陶汉栋

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

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

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

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

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

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

24 Mar, 2018

5 commits

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

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

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

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

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

  # 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