]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commit1f160bb7bc62d8672a4e600ab73fdddffd188194
tree19f9ff47645e961cba97c9487f8803c9df73ac53
parenta6c9445f0de1a74ffc81dda12eaba6ee36410716
parent01a1e882afeb78542b02e4643c5d8a2fa50c2206
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  Handle "forgot to upload an avatar on avatarsettings" a little more gracefully.