mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse source 
Conflicts:
	include/config.php
	update.php
This commit is contained in:
Alexander Kampmann 2012-04-05 13:39:15 +02:00
commit 355c42cb30
1809 changed files with 48790 additions and 7152 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/profile_photo.php Executable file → Normal file
View file

@ -151,7 +151,7 @@ function profile_photo_content(&$a) {
return;
};
check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
// check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
$resource_id = $a->argv[2];
//die(":".local_user());