]> 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: a6c9445 01a1e88)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Fri, 19 Mar 2010 00:20:09 +0000 (17:20 -0700)
committerZach Copley <zach@status.net>
Fri, 19 Mar 2010 00:20:09 +0000 (17:20 -0700)
* 'testing' of gitorious.org:statusnet/mainline:
  Handle "forgot to upload an avatar on avatarsettings" a little more gracefully.


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