aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2015-09-25 22:25:35 +0200
committerzottel <github@zottel.net>2015-09-25 22:25:35 +0200
commit8e410f14b1b5b23e4c7e41d4902ac7b9cb529c1b (patch)
tree7c254dec33d95d0144c657fe506d8ebd73b7cf41
parenta7b2d23e9b59805a35380478ca3501fc315edb78 (diff)
parent9bde18492a66c6657556307d22e88762df938f94 (diff)
downloadvolse-hubzilla-8e410f14b1b5b23e4c7e41d4902ac7b9cb529c1b.tar.gz
volse-hubzilla-8e410f14b1b5b23e4c7e41d4902ac7b9cb529c1b.tar.bz2
volse-hubzilla-8e410f14b1b5b23e4c7e41d4902ac7b9cb529c1b.zip
Merge remote-tracking branch 'upstream/master'
-rw-r--r--images/default_profile_photos/arrow_avatar/300.pngbin13995 -> 0 bytes
-rw-r--r--images/default_profile_photos/arrow_avatar/48.pngbin2111 -> 0 bytes
-rw-r--r--images/default_profile_photos/arrow_avatar/80.pngbin3693 -> 0 bytes
-rw-r--r--images/default_profile_photos/hubzilla_avatar/300.pngbin0 -> 11399 bytes
-rw-r--r--images/default_profile_photos/hubzilla_avatar/48.pngbin0 -> 1807 bytes
-rw-r--r--images/default_profile_photos/hubzilla_avatar/80.pngbin0 -> 3027 bytes
-rw-r--r--images/hubzilla_logo_1.pngbin0 -> 7005 bytes
-rw-r--r--images/hubzilla_logo_2.pngbin0 -> 6845 bytes
-rw-r--r--images/hubzilla_logo_3.pngbin0 -> 6645 bytes
-rw-r--r--images/hubzilla_logo_4.pngbin0 -> 11349 bytes
-rw-r--r--images/hubzilla_logo_5.pngbin0 -> 27623 bytes
-rw-r--r--images/hubzilla_logo_6.pngbin0 -> 8624 bytes
-rw-r--r--images/hz-16.pngbin678 -> 559 bytes
-rw-r--r--images/hz-32.pngbin1358 -> 992 bytes
-rw-r--r--images/hz-64.pngbin2708 -> 1965 bytes
15 files changed, 0 insertions, 0 deletions
diff --git a/images/default_profile_photos/arrow_avatar/300.png b/images/default_profile_photos/arrow_avatar/300.png
deleted file mode 100644
index 2ea9afa2b..000000000
--- a/images/default_profile_photos/arrow_avatar/300.png
+++ /dev/null
Binary files differ
diff --git a/images/default_profile_photos/arrow_avatar/48.png b/images/default_profile_photos/arrow_avatar/48.png
deleted file mode 100644
index 2fa859dbb..000000000
--- a/images/default_profile_photos/arrow_avatar/48.png
+++ /dev/null
Binary files differ
diff --git a/images/default_profile_photos/arrow_avatar/80.png b/images/default_profile_photos/arrow_avatar/80.png
deleted file mode 100644
index 015fc7ebb..000000000
--- a/images/default_profile_photos/arrow_avatar/80.png
+++ /dev/null
Binary files differ
diff --git a/images/default_profile_photos/hubzilla_avatar/300.png b/images/default_profile_photos/hubzilla_avatar/300.png
new file mode 100644
index 000000000..675b57327
--- /dev/null
+++ b/images/default_profile_photos/hubzilla_avatar/300.png
Binary files differ
diff --git a/images/default_profile_photos/hubzilla_avatar/48.png b/images/default_profile_photos/hubzilla_avatar/48.png
new file mode 100644
index 000000000..ed35f3536
--- /dev/null
+++ b/images/default_profile_photos/hubzilla_avatar/48.png
Binary files differ
diff --git a/images/default_profile_photos/hubzilla_avatar/80.png b/images/default_profile_photos/hubzilla_avatar/80.png
new file mode 100644
index 000000000..86352d35a
--- /dev/null
+++ b/images/default_profile_photos/hubzilla_avatar/80.png
Binary files differ
diff --git a/images/hubzilla_logo_1.png b/images/hubzilla_logo_1.png
new file mode 100644
index 000000000..e6494bc5e
--- /dev/null
+++ b/images/hubzilla_logo_1.png
Binary files differ
diff --git a/images/hubzilla_logo_2.png b/images/hubzilla_logo_2.png
new file mode 100644
index 000000000..e235adc0f
--- /dev/null
+++ b/images/hubzilla_logo_2.png
Binary files differ
diff --git a/images/hubzilla_logo_3.png b/images/hubzilla_logo_3.png
new file mode 100644
index 000000000..1e32a737f
--- /dev/null
+++ b/images/hubzilla_logo_3.png
Binary files differ
diff --git a/images/hubzilla_logo_4.png b/images/hubzilla_logo_4.png
new file mode 100644
index 000000000..1e07fcd36
--- /dev/null
+++ b/images/hubzilla_logo_4.png
Binary files differ
diff --git a/images/hubzilla_logo_5.png b/images/hubzilla_logo_5.png
new file mode 100644
index 000000000..ac5921fa9
--- /dev/null
+++ b/images/hubzilla_logo_5.png
Binary files differ
diff --git a/images/hubzilla_logo_6.png b/images/hubzilla_logo_6.png
new file mode 100644
index 000000000..b6c8306b0
--- /dev/null
+++ b/images/hubzilla_logo_6.png
Binary files differ
diff --git a/images/hz-16.png b/images/hz-16.png
index fd234733e..37f467a7a 100644
--- a/images/hz-16.png
+++ b/images/hz-16.png
Binary files differ
diff --git a/images/hz-32.png b/images/hz-32.png
index 54dc7cca3..bbb107fd5 100644
--- a/images/hz-32.png
+++ b/images/hz-32.png
Binary files differ
diff --git a/images/hz-64.png b/images/hz-64.png
index a09479db2..f246413f2 100644
--- a/images/hz-64.png
+++ b/images/hz-64.png
Binary files differ