summaryrefslogtreecommitdiff
path: root/plugins/OStatus/images/96px-Feed-icon.svg.png
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-02-16 10:25:57 -0500
committerCraig Andrews <candrews@integralblue.com>2010-02-16 10:25:57 -0500
commit32084e33a266797b306158df29e48f057651b410 (patch)
tree2a46e529783c8547aaae8ac00c8cac9bdfa61490 /plugins/OStatus/images/96px-Feed-icon.svg.png
parent057ec1fceacbfec1f755a5bc6700a188aa70e33f (diff)
parentd4f6235d7b8a40bd1b51370e7eb405cdb14e61fb (diff)
Merge branch '0.9.x' into 1.0.x
Conflicts: lib/queuemanager.php
Diffstat (limited to 'plugins/OStatus/images/96px-Feed-icon.svg.png')
-rw-r--r--plugins/OStatus/images/96px-Feed-icon.svg.pngbin0 -> 5440 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/plugins/OStatus/images/96px-Feed-icon.svg.png b/plugins/OStatus/images/96px-Feed-icon.svg.png
new file mode 100644
index 000000000..bf16571ec
--- /dev/null
+++ b/plugins/OStatus/images/96px-Feed-icon.svg.png
Binary files differ