]> 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: 31e7d46 9af92f9)
Merge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist
authorEvan Prodromou <evan@status.net>
Tue, 22 Mar 2011 22:17:09 +0000 (18:17 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 22 Mar 2011 22:17:09 +0000 (18:17 -0400)
Conflicts:
classes/Notice.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. :-)