]> 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: 4c09d10 f21cecb)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
authorZach Copley <zach@controlyourself.ca>
Mon, 22 Jun 2009 21:14:33 +0000 (14:14 -0700)
committerZach Copley <zach@controlyourself.ca>
Mon, 22 Jun 2009 21:14:33 +0000 (14:14 -0700)
* '0.8.x' of git@gitorious.org:laconica/dev:
  fixing up conversations


Trivial 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. :-)