]> git.mxchange.org Git - friendica.git/commit
Merge branch 'fabrixxm-master'
authorFriendika <info@friendika.com>
Sat, 29 Jan 2011 02:50:20 +0000 (18:50 -0800)
committerFriendika <info@friendika.com>
Sat, 29 Jan 2011 02:50:20 +0000 (18:50 -0800)
commit26cc2e02fe6e075cd35a3069edbc006219f5b435
treeb687508bd7247100ac0dd51ecf36aed9ea97d5cd
parent5d77bd9489763721b8f3e4a51c8cef1181276157
parent302acda0890a472916b759e6340ce77d9803f105
Merge branch 'fabrixxm-master'

Conflicts:
boot.php
boot.php
mod/dfrn_notify.php
mod/follow.php
mod/photos.php
mod/settings.php