ued / yohogirls_mustache · Commits

04 May, 2015

10 commits

Merge branch 'develop' into test
315c6202

by happyhour7
2015-05-04 11:44:22 +0800
Browse Files
最新模板上传
7681bf6c

by happyhour7
2015-05-04 11:43:37 +0800
Browse Files
Merge branch 'develop' into test
5dee9c4b

by happyhour7
2015-05-04 11:41:04 +0800
Browse Files
最新模板上传
d192339b

by happyhour7
2015-05-04 11:40:13 +0800
Browse Files
Merge branch 'develop' into test
977447ac

by happyhour7
2015-05-04 11:33:52 +0800
Browse Files
最新模板上传
bf6d7a76

by happyhour7
2015-05-04 11:33:10 +0800
Browse Files
Merge branch 'test' of http://git.dev.yoho.cn/ued/yohogirls-mustache into test
c71bb758

by happyhour7
2015-05-04 11:12:15 +0800
Browse Files
Merge branch 'develop' into test ...
711d5f64
```
Conflicts:
	partials/layout/footer_fan.html
	partials/layout/footer_jian.html
	partials/layout/header_fan.html
	partials/layout/header_jian.html
```
by happyhour7
2015-05-04 11:11:08 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
66691cb2

by happyhour7
2015-05-04 11:08:08 +0800
Browse Files
最新模板上传
ffe18b82

by happyhour7
2015-05-04 11:07:59 +0800
Browse Files

30 Apr, 2015

30 commits

Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into test
5beed6b4

by lore-w
2015-04-30 18:15:19 +0800
Browse Files
修改杂志页数据字段
832fbd58

by lore-w
2015-04-30 18:14:04 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:ued/yohogirls-mustache into test
519abdae

by lore-w
2015-04-30 17:27:39 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into test
85e66b9b

by lore-w
2015-04-30 17:27:20 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
6790dee6

by lore-w
2015-04-30 17:26:41 +0800
Browse Files
修改首页数据字段重复bug
45f5f607

by lore-w
2015-04-30 17:26:35 +0800
Browse Files
Merge branch 'test' of http://git.dev.yoho.cn/ued/yohogirls-mustache into test
67c62bb9

by happyhour7
2015-04-30 17:09:42 +0800
Browse Files
Merge branch 'develop' into test
f675b409

by happyhour7
2015-04-30 17:09:26 +0800
Browse Files
下最新模板上传
e1d65d3a

by happyhour7
2015-04-30 17:08:36 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:ued/yohogirls-mustache into test
a7d4c1fa

by lore-w
2015-04-30 16:58:19 +0800
Browse Files
Merge branch 'develop' into test
df362fe3

by happyhour7
2015-04-30 16:56:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
39faf3f9

by happyhour7
2015-04-30 16:55:40 +0800
Browse Files
最新模板上传
565d6a99

by happyhour7
2015-04-30 16:55:20 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into test
01bd692b

by lore-w
2015-04-30 16:44:03 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
27f0b5b0

by lore-w
2015-04-30 16:41:56 +0800
Browse Files
修改测试环境页面显示异常bug
9547be48

by lore-w
2015-04-30 16:41:53 +0800
Browse Files
Merge branch 'develop' into test
71471f39

by happyhour7
2015-04-30 16:24:35 +0800
Browse Files
最新模板上传
7483ab7a

by happyhour7
2015-04-30 16:23:34 +0800
Browse Files
Merge branch 'test' of http://git.dev.yoho.cn/ued/yohogirls-mustache into test
2388d9ca

by happyhour7
2015-04-30 15:58:53 +0800
Browse Files
Merge branch 'develop' into test
503fc3b3

by happyhour7
2015-04-30 15:58:20 +0800
Browse Files
最新模板上传
c7ae97a5

by happyhour7
2015-04-30 15:57:06 +0800
Browse Files
解决web footer冲突
f03dd1a5

by lore-w
2015-04-30 15:51:16 +0800
Browse Files
girl mobile静态资源路径
b0749a2d

by lore-w
2015-04-30 15:49:33 +0800
Browse Files
Merge branch 'develop' into test
d6eba9a8

by happyhour7
2015-04-30 15:44:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
8f24eda3

by happyhour7
2015-04-30 15:43:06 +0800
Browse Files
最新代码上传
de10c732

by happyhour7
2015-04-30 15:42:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
104dfc3d

by 2586703@qq.com
2015-04-30 15:38:54 +0800
Browse Files
图片路径修改
d4d7f937

by 2586703@qq.com
2015-04-30 15:38:48 +0800
Browse Files
j解决footer冲突
c9d65e67

by lore-w
2015-04-30 15:34:17 +0800
Browse Files
最新模板上传
8bed7d78

by happyhour7
2015-04-30 15:30:46 +0800
Browse Files