]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1acc7d6 49611af)
Merge branch 'master' of gitorious.org:statusnet/mainline into feedfix
authorBrion Vibber <brion@pobox.com>
Thu, 30 Sep 2010 18:31:29 +0000 (11:31 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 30 Sep 2010 18:31:29 +0000 (11:31 -0700)
1  2 
lib/activityobject.php patch | diff1 | diff2 | blob | history

diff --cc lib/activityobject.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)