]> 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: f6705f0 3274412)
Merge commit 'upstream/0.7.x' into 0.7.x
authorSean Murphy <sgmurphy@gmail.com>
Mon, 9 Feb 2009 22:29:39 +0000 (17:29 -0500)
committerSean Murphy <sgmurphy@gmail.com>
Mon, 9 Feb 2009 22:29:39 +0000 (17:29 -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. :-)