陶汉栋 / ParentWork | GitLab

10 Apr, 2018

2 commits

a0178454 no message Browse Dir »

陶汉栋
2018-04-10 11:02:25 +0800
7cd6b667 no message Browse Dir »

陶汉栋
2018-04-10 11:00:16 +0800

08 Apr, 2018

2 commits

08b7799e no message Browse Dir »

姚旭斌
2018-04-08 19:23:34 +0800
49837d23 no message Browse Dir »

姚旭斌
2018-04-08 11:09:15 +0800

04 Apr, 2018

4 commits

a299f710 Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	.idea/modules.xml
#	app/libs/processor.jar
```
姚旭斌
2018-04-04 21:43:39 +0800
9bb016c5 no message Browse Dir »

陶汉栋
2018-04-04 18:48:15 +0800
24a5ea4a no message Browse Dir »

姚旭斌
2018-04-04 09:47:58 +0800
6a4eb0f4 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# Conflicts:
#	app/libs/processor.jar
```
张道锋
2018-04-04 09:34:02 +0800

30 Mar, 2018

1 commit

cb057a09 no message Browse Dir »

姚旭斌
2018-03-30 14:56:23 +0800

29 Mar, 2018

3 commits

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

张道锋
2018-03-29 18:09:40 +0800
e280dc61 no message Browse Dir »

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

陶汉栋
2018-03-29 09:32:39 +0800

28 Mar, 2018

2 commits

0cbfbb68 no message Browse Dir »

陶汉栋
2018-03-28 19:37:03 +0800
62be613c no message Browse Dir »

姚旭斌
2018-03-28 19:35:03 +0800

27 Mar, 2018

3 commits

4f854ee0 no message Browse Dir »

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

张道锋
2018-03-27 16:50:11 +0800
92beb983 no message Browse Dir »

陶汉栋
2018-03-27 10:59:29 +0800

26 Mar, 2018

3 commits

e18ab61a no message Browse Dir »

陶汉栋
2018-03-26 17:52:42 +0800
03d187a4 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

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

张道锋
2018-03-26 10:08:18 +0800

24 Mar, 2018

20 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
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
e92104a6 no message Browse Dir »

姚旭斌
2018-03-24 16:19:30 +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