]> git.mxchange.org Git - friendica.git/commit
Merge branch 'chriscase-master'
authorFriendika <info@friendika.com>
Thu, 17 Feb 2011 22:05:51 +0000 (14:05 -0800)
committerFriendika <info@friendika.com>
Thu, 17 Feb 2011 22:05:51 +0000 (14:05 -0800)
commit0bf8e418a8b8c57607ed8a52cff6b3ac53d38d05
tree26a8df206e8fbd8f91fd33afb8b62a5c67f72386
parent45bd7d5e290957a6af38cd44a32033938b8ccdb0
parent9e654f7e5777458941e93b4bfa6de2a11d4374f9
Merge branch 'chriscase-master'

Conflicts:
mod/dfrn_notify.php
mod/dfrn_notify.php