]> 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: 80ba45d 7a00be5)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 14 Apr 2011 20:09:18 +0000 (16:09 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 14 Apr 2011 20:09:18 +0000 (16:09 -0400)
1  2 
lib/profileaction.php patch | diff1 | diff2 | blob | history

diff --cc lib/profileaction.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. :-)