]> 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: 0651404 8cdb319)
Merge branch '0.9.x' into 1.0.x
authorCraig Andrews <candrews@integralblue.com>
Thu, 28 Jan 2010 21:13:06 +0000 (16:13 -0500)
committerCraig Andrews <candrews@integralblue.com>
Thu, 28 Jan 2010 21:13:06 +0000 (16:13 -0500)
1  2 
actions/showstream.php patch | diff1 | diff2 | blob | history

diff --cc actions/showstream.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. :-)