YOHOBUY / yohobuy-union · Commits

17 Nov, 2016

15 commits

Merge branch 'union_1101' of http://git.yoho.cn/yoho30/yohobuy-union into union_1101
e3dfe3b9

by chaogeng
2016-11-17 18:40:22 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/yoho30/yohobuy-union
52e71d0e

by chaogeng
2016-11-17 18:39:21 +0800
Browse Files
update
1609f74a

by chaogeng
2016-11-17 18:38:34 +0800
Browse Files
update
85f69563

by linlong
2016-11-17 18:04:16 +0800
Browse Files
update
f229d6e6

by zhengwen.ge
2016-11-17 17:27:04 +0800
Browse Files
Merge branch 'union_1101' of git.yoho.cn:yoho30/yohobuy-union into union_1101 ...
1caa8b8e
```
# By zhouxiang
# Via zhouxiang
* 'union_1101' of git.yoho.cn:yoho30/yohobuy-union:
  no message
```
by linlong
2016-11-17 17:22:31 +0800
Browse Files
update
7ba6dd07

by linlong
2016-11-17 17:22:05 +0800
Browse Files
no message
4bf942c7

by zhouxiang
2016-11-17 16:49:19 +0800
Browse Files
union
cab0e6d2

by zhengwen.ge
2016-11-17 16:10:41 +0800
Browse Files
update
241dacce

by zhengwen.ge
2016-11-17 14:16:08 +0800
Browse Files
Merge branch 'master' into union_1101
0217a6d8

by chaogeng
2016-11-17 11:04:09 +0800
Browse Files
update
c25ba662

by chaogeng
2016-11-17 10:55:36 +0800
Browse Files
添加阿里测试联盟
cdd91ec5

by ping
2016-11-17 10:53:38 +0800
Browse Files
Merge branch 'union_1101' of http://git.yoho.cn/yoho30/yohobuy-union into union_1101
af877016

by chaogeng
2016-11-17 09:45:32 +0800
Browse Files
update
1b322663

by chaogeng
2016-11-17 09:43:25 +0800
Browse Files

16 Nov, 2016

10 commits

update
066542af

by zhengwen.ge
2016-11-16 20:51:12 +0800
Browse Files
Merge branch 'union_1101' of http://git.yoho.cn/yoho30/yohobuy-union into union_1101
1d5211ee

by zhengwen.ge
2016-11-16 20:18:50 +0800
Browse Files
品友
211e1eee

by zhengwen.ge
2016-11-16 20:18:19 +0800
Browse Files
update
03dc3dca

by linlong
2016-11-16 20:17:22 +0800
Browse Files
品友优化
748b4477

by zhengwen.ge
2016-11-16 14:36:20 +0800
Browse Files
update
34b4d554

by zhengwen.ge
2016-11-16 14:25:17 +0800
Browse Files
品友
8915da9b

by zhengwen.ge
2016-11-16 11:26:31 +0800
Browse Files
update
fc36414c

by linlong
2016-11-16 10:16:07 +0800
Browse Files
update
cb940397

by linlong
2016-11-16 10:13:40 +0800
Browse Files
update
5c778a8f

by linlong
2016-11-16 10:09:47 +0800
Browse Files

15 Nov, 2016

12 commits

Merge branch 'union_1101' of http://git.yoho.cn/yoho30/yohobuy-union into union_1101
58b31314

by chaogeng
2016-11-15 19:47:41 +0800
Browse Files
update
8dba545a

by chaogeng
2016-11-15 19:47:18 +0800
Browse Files
品友
735353bb

by zhengwen.ge
2016-11-15 18:51:29 +0800
Browse Files
Merge branch 'union_1101' of http://git.yoho.cn/yoho30/yohobuy-union into union_1101
41ae2f07

by chaogeng
2016-11-15 18:18:37 +0800
Browse Files
update
1b917fb9

by chaogeng
2016-11-15 18:17:21 +0800
Browse Files
Merge branch 'master' into union_1101 ...
f243655e
```
# Conflicts:
#	.gitignore
#	common/src/main/resources/union-type.yml
#	pom.xml
```
by zhengwen.ge
2016-11-15 16:21:09 +0800
Browse Files
增加阿里测试链接
e6349a69

by ping
2016-11-15 14:48:15 +0800
Browse Files
add type
5266cfda

by ping
2016-11-15 11:47:26 +0800
Browse Files
增加联盟
0bae239e

by ping
2016-11-15 11:39:21 +0800
Browse Files
Merge branch 'union_1101' of git.yoho.cn:yoho30/yohobuy-union into union_1101 ...
71479b91
```
# By chaogeng
# Via chaogeng
* 'union_1101' of git.yoho.cn:yoho30/yohobuy-union:
  update
```
by linlong
2016-11-15 10:36:27 +0800
Browse Files
update
6ab0aa45

by chaogeng
2016-11-15 10:29:43 +0800
Browse Files
update
112122ed

by linlong
2016-11-15 10:03:20 +0800
Browse Files

14 Nov, 2016

1 commit

update
4c6018f0

by linlong
2016-11-14 14:31:42 +0800
Browse Files

11 Nov, 2016

2 commits

Merge branch 'union_1101' of http://git.yoho.cn/yoho30/yohobuy-union into union_1101
1b8c4edf

by zhouxiang
2016-11-11 14:11:17 +0800
Browse Files
update
537b96d8

by linlong
2016-11-11 14:12:08 +0800
Browse Files