陶汉栋 / ParentWork | GitLab

10 Apr, 2018

3 commits

fd11b76f Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-04-10 19:38:31 +0800
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

9595d58e no message Browse Dir »

姚旭斌
2018-04-08 21:58:54 +0800
08b7799e no message Browse Dir »

姚旭斌
2018-04-08 19:23:34 +0800

04 Apr, 2018

3 commits

5800945b no message Browse Dir »

姚旭斌
2018-04-04 10:46:36 +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

1 commit

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

张道锋
2018-03-29 18:09:40 +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

26 Mar, 2018

1 commit

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

10 commits

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

陶汉栋
2018-03-24 17:43:58 +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
7b8a96d8 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

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

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

陶汉栋
2018-03-24 11:15:17 +0800
3305740f no message Browse Dir »

陶汉栋
2018-03-24 10:26:30 +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

23 Mar, 2018

3 commits

7c993489 no message Browse Dir »

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

陶汉栋
2018-03-23 16:47:02 +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

22 Mar, 2018

3 commits

ee0f03b1 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-22 18:17:38 +0800
cc9bfb52 no message Browse Dir »

陶汉栋
2018-03-22 18:08:54 +0800
50ca3597 no message Browse Dir »

张道锋
2018-03-22 11:06:39 +0800

21 Mar, 2018

4 commits

d045d156 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-21 15:26:55 +0800
8c263840 no message Browse Dir »

陶汉栋
2018-03-21 14:42:38 +0800
561e50fc Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-21 09:52:55 +0800
10a30b8e no message Browse Dir »

姚旭斌
2018-03-21 09:23:27 +0800

20 Mar, 2018

7 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
6a922153 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-20 14:40:50 +0800
e80f1b4f no message Browse Dir »

姚旭斌
2018-03-20 13:59:31 +0800
69e40270 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-20 11:32:10 +0800
9e6ee8e8 no message Browse Dir »

陶汉栋
2018-03-20 11:23:21 +0800
b8df71fe Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# Conflicts:
#	.idea/modules.xml
#	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
```
陶汉栋
2018-03-20 08:29:22 +0800