bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into 1702-only-worker

Browse source 
Conflicts:
	include/onepoll.php
	include/queue.php
This commit is contained in:
Michael 2017-03-12 21:03:44 +00:00
commit 77e8c44016
26 changed files with 13391 additions and 13065 deletions
Download patch file Download diff file Expand all files Collapse all files

6
view/templates/netfriend.tpl
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>