ued / yohogirls_mustache · Commits

Go to a project

Authored by uedxwg
Commit 9dc179ffda31709a4160922559eff6f5ce4c95ae 2 parents 9c1d3ac2 4030eb91

Merge branch 'test' 

# Conflicts:
#	partials/common/environment_css.html
Inline Side-by-side
Showing 1 changed file with 1 additions and 2 deletions
@@ -8,6 +8,5 @@ @@ -8,6 +8,5 @@
8 <link rel="stylesheet" type="text/css" href="http://res.previewboys.yoho.cn/res/new/girls/css/girls.css" /> 8 <link rel="stylesheet" type="text/css" href="http://res.previewboys.yoho.cn/res/new/girls/css/girls.css" />
9 {{/ prevEnvironment}} 9 {{/ prevEnvironment}}
10 {{# prodEnvironment}} 10 {{# prodEnvironment}}
11 -<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.3/girls.css"/> 11 +<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.4/girls.css"/>
12 {{/ prodEnvironment}} 12 {{/ prodEnvironment}}
13 -