]> 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: 4092484 15ae1cd)
Merge branch '1.0.x' into nummedout
authorEvan Prodromou <evan@status.net>
Wed, 14 Sep 2011 16:20:37 +0000 (12:20 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 14 Sep 2011 16:20:37 +0000 (12:20 -0400)
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. :-)