]> 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: a0a9c7b 499b355)
Merge branch 'master' into 0.8.x
authorEvan Prodromou <evan@status.net>
Mon, 9 Nov 2009 22:43:45 +0000 (17:43 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 9 Nov 2009 22:43:45 +0000 (17:43 -0500)
Conflicts:
scripts/updateavatarurl.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. :-)