projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3898039 31fd4db)
Merge branch 'limitdist2' into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 29 Mar 2011 21:32:17 +0000 (17:32 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 29 Mar 2011 21:32:17 +0000 (17:32 -0400)
1  2 
classes/Profile.php patch | diff1 | diff2 | blob | history

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