]> 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: c6f0930 512e511)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
authorSarven Capadisli <csarven@status.net>
Thu, 11 Mar 2010 21:39:07 +0000 (16:39 -0500)
committerSarven Capadisli <csarven@status.net>
Thu, 11 Mar 2010 21:39:07 +0000 (16:39 -0500)
1  2 
classes/User.php patch | diff1 | diff2 | blob | history

diff --cc classes/User.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. :-)