projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d260d84 60f737d)
Merge branch '0.7.x' into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 20:38:10 +0000 (15:38 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 20:38:10 +0000 (15:38 -0500)
1  2 
README patch | diff1 | diff2 | blob | history

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