]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb1c6dd 6a9e225)
Merge remote-tracking branch 'upstream/master'
authorDevlon Duthie <duthied@gmail.com>
Sun, 25 Sep 2011 18:30:55 +0000 (13:30 -0500)
committerDevlon Duthie <duthied@gmail.com>
Sun, 25 Sep 2011 18:30:55 +0000 (13:30 -0500)
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.