]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ff1a34 c0a2cc3)
Merge branch 'pull'
authorFriendika <info@friendika.com>
Sun, 4 Sep 2011 07:51:42 +0000 (00:51 -0700)
committerFriendika <info@friendika.com>
Sun, 4 Sep 2011 07:51:42 +0000 (00:51 -0700)
1  2 
include/bb2diaspora.php patch | diff1 | diff2 | blob | history

diff --cc include/bb2diaspora.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.