summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-18 17:20:09 -0700
committerZach Copley <zach@status.net>2010-03-18 17:20:09 -0700
commit1f160bb7bc62d8672a4e600ab73fdddffd188194 (patch)
tree19f9ff47645e961cba97c9487f8803c9df73ac53 /plugins
parenta6c9445f0de1a74ffc81dda12eaba6ee36410716 (diff)
parent01a1e882afeb78542b02e4643c5d8a2fa50c2206 (diff)
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.
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions