]> 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: bb55784 1033e1e)
Merge branch 'activityatompub' into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 13 Dec 2010 19:35:42 +0000 (14:35 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 13 Dec 2010 19:35:42 +0000 (14:35 -0500)

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