]> 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: 47300a2 17ed30d)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Mon, 22 Feb 2010 09:23:24 +0000 (01:23 -0800)
committerZach Copley <zach@status.net>
Mon, 22 Feb 2010 09:23:24 +0000 (01:23 -0800)
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. :-)