]> 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: 1cf67f4 58b9ce5)
Merge commit 'refs/merge-requests/1900' of git://gitorious.org/statusnet/mainline...
authorBrion Vibber <brion@pobox.com>
Mon, 2 Nov 2009 18:16:06 +0000 (10:16 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 2 Nov 2009 18:16:06 +0000 (10:16 -0800)
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. :-)