]> 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: 8620176 194bb02)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Tue, 2 Nov 2010 20:14:42 +0000 (13:14 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 2 Nov 2010 20:14:42 +0000 (13:14 -0700)
1  2 
plugins/Realtime/RealtimePlugin.php patch | diff1 | diff2 | blob | history

diff --cc plugins/Realtime/RealtimePlugin.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. :-)