ued / yohogirls_mustache · Commits

Go to a project

Authored by unknown
Commit 3773a594a57cf495b4e119542114cccec9f04c37 2 parents 5fd7f3b0 02f3200a

Merge branch 'develop' into test

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -15,10 +15,10 @@ @@ -15,10 +15,10 @@
15 {{# trialStatus}} 15 {{# trialStatus}}
16 {{> common/trial_status}} 16 {{> common/trial_status}}
17 {{/ trialStatus}} 17 {{/ trialStatus}}
18 -  
19 - {{^ trialEnd}} 18 +
  19 + {{#unless toolTip}}
20 {{> detail/application_form}} 20 {{> detail/application_form}}
21 - {{/ trialEnd}} 21 + {{/unless}}
22 22
23 {{> detail/tooltip}} 23 {{> detail/tooltip}}
24 <div class="review-list-wrap" id="{{id}}"> 24 <div class="review-list-wrap" id="{{id}}">
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 {{/ trialStatus}} 17 {{/ trialStatus}}
18 18
19 {{#unless toolTip}} 19 {{#unless toolTip}}
20 - {{> detail/application_form_hk}} 20 + {{> detail/application_form}}
21 {{/unless}} 21 {{/unless}}
22 22
23 {{> detail/tooltip}} 23 {{> detail/tooltip}}