]> 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: 383e6c7 e08b7f7)
Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy...
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 06:05:30 +0000 (01:05 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 06:05:30 +0000 (01:05 -0500)
1  2 
lib/util.php patch | diff1 | diff2 | blob | history

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