]> 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: e3b891f 855f1f6)
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
authorIan Denhardt <ian@zenhack.net>
Thu, 12 Aug 2010 16:22:10 +0000 (12:22 -0400)
committerIan Denhardt <ian@zenhack.net>
Thu, 12 Aug 2010 16:22:10 +0000 (12:22 -0400)

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