]> 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: fb68199 a3c08fa)
Merge branch 'testing' into moveaccount
authorEvan Prodromou <evan@status.net>
Mon, 17 Jan 2011 22:34:03 +0000 (17:34 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 17 Jan 2011 22:34:03 +0000 (17:34 -0500)
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. :-)