aboutsummaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-08-17 17:35:37 +0200
committerfabrixxm <fabrix.xm@gmail.com>2011-08-17 17:35:37 +0200
commitbdf42473a0341f291cd256323d122aa80bb0cb0b (patch)
tree922a5ba24a34d7ea89673019e82f68436edb7091 /images
parent6c423feed2d8bc5bd36d2a1cbac073915e523749 (diff)
parentdb03b1ab173d61b1ee75271dac1e48f3475ad42c (diff)
downloadvolse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.tar.gz
volse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.tar.bz2
volse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.zip
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'images')
-rw-r--r--images/diaspora.pngbin0 -> 461 bytes
-rw-r--r--images/friendika-16.pngbin770 -> 756 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/images/diaspora.png b/images/diaspora.png
new file mode 100644
index 000000000..725fae718
--- /dev/null
+++ b/images/diaspora.png
Binary files differ
diff --git a/images/friendika-16.png b/images/friendika-16.png
index 3793508fb..745b7ac6c 100644
--- a/images/friendika-16.png
+++ b/images/friendika-16.png
Binary files differ