]> 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: d8a3a88 b83e700)
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Mon, 20 Dec 2010 22:28:43 +0000 (14:28 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 20 Dec 2010 22:28:43 +0000 (14:28 -0800)
1  2 
EVENTS.txt patch | diff1 | diff2 | blob | history

diff --cc EVENTS.txt
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. :-)