]> 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: 3df69fe 70c8de4)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 14 Apr 2011 22:28:03 +0000 (18:28 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 14 Apr 2011 22:28:03 +0000 (18:28 -0400)
Conflicts:
classes/Profile.php

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. :-)