]> 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: 73dccdd 35d9a06)
Merge branch '0.9.x' into socialbookmark
authorEvan Prodromou <evan@status.net>
Wed, 22 Dec 2010 20:09:42 +0000 (12:09 -0800)
committerEvan Prodromou <evan@status.net>
Wed, 22 Dec 2010 20:09:42 +0000 (12:09 -0800)
Conflicts:
lib/activityobject.php


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