bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup

Browse source 
Conflicts:
	mod/dfrn_poll.php
This commit is contained in:
Friendika 2011-04-04 01:22:05 -07:00
commit 379af25215
12 changed files with 163 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/dfrn_poll.php
View file

@ -445,7 +445,7 @@ function dfrn_poll_content(&$a) {
'sec' => $sec
));
}
$profile = $r[0]['nickname'];
switch($destination_url) {
@ -489,6 +489,10 @@ function dfrn_poll_content(&$a) {
dbesc($session_id)
);
}
<<<<<<< HEAD
=======
>>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485
goaway($dest);
}