]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d1b153 9260bb4)
Merge branch 'chriscase-master'
authorFriendika <info@friendika.com>
Sun, 20 Feb 2011 09:42:11 +0000 (01:42 -0800)
committerFriendika <info@friendika.com>
Sun, 20 Feb 2011 09:42:11 +0000 (01:42 -0800)
Conflicts:
mod/dfrn_notify.php


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.