]> 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: ad726a1 ab4f4db)
Merge commit 'refs/merge-requests/166' of git://gitorious.org/statusnet/mainline...
authorEvan Prodromou <evan@status.net>
Wed, 21 Sep 2011 19:24:17 +0000 (15:24 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 21 Sep 2011 19:24:17 +0000 (15:24 -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. :-)