陶汉栋 / ParentWork

26 Mar, 2018

8 commits

853d6390 no message Browse Dir »

陶汉栋
2018-03-26 15:33:00 +0800
1a085af7 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

张道锋
2018-03-26 15:25:55 +0800
c0619d56 no message Browse Dir »

陶汉栋
2018-03-26 15:23:32 +0800
38b93710 no message Browse Dir »

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

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

陶汉栋
2018-03-26 10:21:23 +0800
6648d446 no message Browse Dir »

姚旭斌
2018-03-26 10:19:59 +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

23 commits

f8c93dce Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-24 18:04:08 +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
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
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
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
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

23 Mar, 2018

9 commits

257465ea no message Browse Dir »

陶汉栋
2018-03-23 17:46:50 +0800
7c993489 no message Browse Dir »

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

陶汉栋
2018-03-23 16:47:02 +0800
d106d2db Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
姚旭斌
2018-03-23 16:19:57 +0800
bec10697 no message Browse Dir »

姚旭斌
2018-03-23 16:15:54 +0800
c5aac4c3 no message Browse Dir »

陶汉栋
2018-03-23 16:06:22 +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
d878d22f no message Browse Dir »

陶汉栋
2018-03-23 16:03:37 +0800
abf181bd no message Browse Dir »

张道锋
2018-03-23 16:01:44 +0800