]> git.mxchange.org Git - friendica.git/commit
Merge branch 'fabrixxm-master'
authorFriendika <info@friendika.com>
Tue, 24 May 2011 01:17:02 +0000 (18:17 -0700)
committerFriendika <info@friendika.com>
Tue, 24 May 2011 01:17:02 +0000 (18:17 -0700)
commit78b2db3a9840f551c951bf0a58a54cce08133bcf
tree95ed3bd4e52218640d0c13f9691da5a051be5cd8
parent3e6180183bdc01edfa01dc4b966daa4081c29604
parentdd32a2366c52f7cd234a562c2d9ab7627f162305
Merge branch 'fabrixxm-master'

Conflicts:
boot.php
boot.php
include/auth.php
index.php
mod/openid.php