]> 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: 91367db 7005ef6)
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Wed, 19 May 2010 19:52:23 +0000 (12:52 -0700)
committerBrion Vibber <brion@pobox.com>
Wed, 19 May 2010 19:52:23 +0000 (12:52 -0700)
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. :-)