]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3691b3 43be722)
Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed
authorFriendika <info@friendika.com>
Wed, 26 Jan 2011 21:59:20 +0000 (13:59 -0800)
committerFriendika <info@friendika.com>
Wed, 26 Jan 2011 21:59:20 +0000 (13:59 -0800)
1  2 
mod/network.php patch | diff1 | diff2 | blob | history

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