]> 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: 76b0e6e aa0d9a8)
Merge branch '0.9.x' into adminpanel
authorEvan Prodromou <evan@status.net>
Mon, 9 Nov 2009 02:41:43 +0000 (21:41 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 9 Nov 2009 02:41:43 +0000 (21:41 -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. :-)