Authored by uedxwg

Merge branch 'test'

# Conflicts:
#	partials/common/environment_css.html
... ... @@ -8,6 +8,5 @@
<link rel="stylesheet" type="text/css" href="http://res.previewboys.yoho.cn/res/new/girls/css/girls.css" />
{{/ prevEnvironment}}
{{# prodEnvironment}}
<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.3/girls.css"/>
<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.4/girls.css"/>
{{/ prodEnvironment}}
... ...