summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-25 18:57:12 -0800
committerZach Copley <zach@status.net>2010-02-25 18:57:12 -0800
commitcf61f36e6b313659b3c3fb253972d06c7113f1e8 (patch)
tree25372b7649e125b2ee149da155f2f9fbae169c2e /COPYING
parentd8d8d59a03ef3fa12a0ea668b4a2f383f80486dc (diff)
parent2fa953da22fe932f758882a93106672ab22c1c6d (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline: OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first) info about discovery in Ostatus_profile::ensureWebfinger() cache Web responses in Webfinger library
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions