1
0
Fork 0

Merge remote-tracking branch 'upstream/develop' into 1702-no-language

This commit is contained in:
Michael 2017-03-12 20:50:20 +00:00
commit b6a4a2ec7f
28 changed files with 13463 additions and 13120 deletions

View file

@ -1,5 +1,9 @@
<div class="intro-approve-as-friend-desc">{{$approve_as}}</div>
<div class="intro-approve-as-friend-desc">
<p>{{$approve_as1}}</p>
<p>{{$approve_as2}}</p>
<p>{{$approve_as3}}</p>
</div>
<div class="intro-approve-as-friend-wrapper">
<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-{{$intro_id}}">{{$as_friend}}</label>