]> 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: 49a872b f3cea24)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline
authorBrion Vibber <brion@pobox.com>
Wed, 3 Mar 2010 17:53:38 +0000 (09:53 -0800)
committerBrion Vibber <brion@pobox.com>
Wed, 3 Mar 2010 17:53:38 +0000 (09:53 -0800)
Conflicts:
plugins/OStatus/OStatusPlugin.php

1  2 
lib/activity.php patch | diff1 | diff2 | blob | history

diff --cc lib/activity.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. :-)