]> 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: db4ffca d95f45f)
Merge commit 'br3nda/0.8.x-hashtags' into 0.8.x
authorCraig Andrews <candrews@integralblue.com>
Wed, 22 Jul 2009 14:23:17 +0000 (10:23 -0400)
committerCraig Andrews <candrews@integralblue.com>
Wed, 22 Jul 2009 14:23:17 +0000 (10:23 -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. :-)