diff options
author | Brion Vibber <brion@pobox.com> | 2010-04-06 15:22:23 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-04-06 15:22:23 -0700 |
commit | 5dc169260dc36209dd5ad0d4d4cac2bdaaefe62c (patch) | |
tree | c5fb50f7fbf6ff20b581c1ad5b50f2e19e6d7584 /plugins/OStatus/images/48px-Feed-icon.svg.png | |
parent | a3314f483ec3250b322666a769a10197fb9dfff0 (diff) | |
parent | 4bb75d1c8e22b7bfc689a9e582ef846515a90383 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/images/48px-Feed-icon.svg.png')
0 files changed, 0 insertions, 0 deletions