]> 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: 37c62c6 6a19bcc)
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
authorSiebrand Mazeland <s.mazeland@xs4all.nl>
Wed, 11 Nov 2009 18:58:43 +0000 (19:58 +0100)
committerSiebrand Mazeland <s.mazeland@xs4all.nl>
Wed, 11 Nov 2009 18:58:43 +0000 (19:58 +0100)
1  2 
actions/noticesearch.php patch | diff1 | diff2 | blob | history

diff --cc actions/noticesearch.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. :-)