]> 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: ca5612c 515cdf2)
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Thu, 18 Mar 2010 17:55:20 +0000 (10:55 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 18 Mar 2010 17:55:20 +0000 (10:55 -0700)
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. :-)