aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-01 20:46:29 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-01 20:46:29 +0200
commit2ce1e3678acd59409f1013433db99df6624c2895 (patch)
tree08d35996d6ff1b7fd4f812c4c00349c20b6ab31c
parent365d690d7d32926b1fb4b1e4b7150dce70343f38 (diff)
parente75616517d80ad71d4fd387c501effce0e1aeb14 (diff)
downloadvolse-hubzilla-2ce1e3678acd59409f1013433db99df6624c2895.tar.gz
volse-hubzilla-2ce1e3678acd59409f1013433db99df6624c2895.tar.bz2
volse-hubzilla-2ce1e3678acd59409f1013433db99df6624c2895.zip
Merge remote-tracking branch 'upstream/master'
-rw-r--r--images/default_profile_photos/alpha/300.pngbin3817 -> 524 bytes
-rw-r--r--images/default_profile_photos/arrow_avatar/300.pngbin7792 -> 14163 bytes
-rw-r--r--images/default_profile_photos/arrow_avatar/48.pngbin1998 -> 2279 bytes
-rw-r--r--images/default_profile_photos/arrow_avatar/80.pngbin2928 -> 3861 bytes
-rw-r--r--images/default_profile_photos/black_avatar_1/300.pngbin6420 -> 11081 bytes
-rw-r--r--images/default_profile_photos/black_avatar_2/300.pngbin5802 -> 10148 bytes
-rw-r--r--images/default_profile_photos/blank/300.jpgbin910 -> 1630 bytes
-rw-r--r--images/default_profile_photos/blank/300.pngbin3817 -> 906 bytes
-rw-r--r--images/default_profile_photos/rainbow_man/300.jpgbin8510 -> 26219 bytes
-rw-r--r--images/default_profile_photos/rainbow_man/300.pngbin57998 -> 101379 bytes
-rw-r--r--images/default_profile_photos/rainbow_man_trans/300.pngbin71198 -> 117156 bytes
-rw-r--r--images/default_profile_photos/red_avatar/300.pngbin4621 -> 8856 bytes
-rw-r--r--images/default_profile_photos/red_koala/300.jpgbin22969 -> 38412 bytes
-rw-r--r--images/default_profile_photos/red_koala/300.pngbin20722 -> 28671 bytes
-rw-r--r--images/default_profile_photos/red_koala_trans/300.pngbin25546 -> 37012 bytes
-rw-r--r--images/default_profile_photos/redmatrix_logo_smiley/300.pngbin3834 -> 7930 bytes
16 files changed, 0 insertions, 0 deletions
diff --git a/images/default_profile_photos/alpha/300.png b/images/default_profile_photos/alpha/300.png
index 17211ee27..9e36606b8 100644
--- a/images/default_profile_photos/alpha/300.png
+++ b/images/default_profile_photos/alpha/300.png
Binary files differ
diff --git a/images/default_profile_photos/arrow_avatar/300.png b/images/default_profile_photos/arrow_avatar/300.png
index 1c30572d6..a13221ceb 100644
--- a/images/default_profile_photos/arrow_avatar/300.png
+++ b/images/default_profile_photos/arrow_avatar/300.png
Binary files differ
diff --git a/images/default_profile_photos/arrow_avatar/48.png b/images/default_profile_photos/arrow_avatar/48.png
index 7865ce2b4..aaa86c152 100644
--- a/images/default_profile_photos/arrow_avatar/48.png
+++ b/images/default_profile_photos/arrow_avatar/48.png
Binary files differ
diff --git a/images/default_profile_photos/arrow_avatar/80.png b/images/default_profile_photos/arrow_avatar/80.png
index 8610907e2..cf48c584a 100644
--- a/images/default_profile_photos/arrow_avatar/80.png
+++ b/images/default_profile_photos/arrow_avatar/80.png
Binary files differ
diff --git a/images/default_profile_photos/black_avatar_1/300.png b/images/default_profile_photos/black_avatar_1/300.png
index bc5b19793..0ed1fe763 100644
--- a/images/default_profile_photos/black_avatar_1/300.png
+++ b/images/default_profile_photos/black_avatar_1/300.png
Binary files differ
diff --git a/images/default_profile_photos/black_avatar_2/300.png b/images/default_profile_photos/black_avatar_2/300.png
index 8ff3cbd4c..c86490d7c 100644
--- a/images/default_profile_photos/black_avatar_2/300.png
+++ b/images/default_profile_photos/black_avatar_2/300.png
Binary files differ
diff --git a/images/default_profile_photos/blank/300.jpg b/images/default_profile_photos/blank/300.jpg
index 4024d6e88..6d039cd05 100644
--- a/images/default_profile_photos/blank/300.jpg
+++ b/images/default_profile_photos/blank/300.jpg
Binary files differ
diff --git a/images/default_profile_photos/blank/300.png b/images/default_profile_photos/blank/300.png
index 1edb25b76..dda9daa5e 100644
--- a/images/default_profile_photos/blank/300.png
+++ b/images/default_profile_photos/blank/300.png
Binary files differ
diff --git a/images/default_profile_photos/rainbow_man/300.jpg b/images/default_profile_photos/rainbow_man/300.jpg
index fc0ec3d77..d1d35c7d2 100644
--- a/images/default_profile_photos/rainbow_man/300.jpg
+++ b/images/default_profile_photos/rainbow_man/300.jpg
Binary files differ
diff --git a/images/default_profile_photos/rainbow_man/300.png b/images/default_profile_photos/rainbow_man/300.png
index 30a7e0ffb..b8541ef48 100644
--- a/images/default_profile_photos/rainbow_man/300.png
+++ b/images/default_profile_photos/rainbow_man/300.png
Binary files differ
diff --git a/images/default_profile_photos/rainbow_man_trans/300.png b/images/default_profile_photos/rainbow_man_trans/300.png
index a0a236841..b715f67ea 100644
--- a/images/default_profile_photos/rainbow_man_trans/300.png
+++ b/images/default_profile_photos/rainbow_man_trans/300.png
Binary files differ
diff --git a/images/default_profile_photos/red_avatar/300.png b/images/default_profile_photos/red_avatar/300.png
index 31d39a41a..9188aa08c 100644
--- a/images/default_profile_photos/red_avatar/300.png
+++ b/images/default_profile_photos/red_avatar/300.png
Binary files differ
diff --git a/images/default_profile_photos/red_koala/300.jpg b/images/default_profile_photos/red_koala/300.jpg
index e49343b1d..b9c8ffeaf 100644
--- a/images/default_profile_photos/red_koala/300.jpg
+++ b/images/default_profile_photos/red_koala/300.jpg
Binary files differ
diff --git a/images/default_profile_photos/red_koala/300.png b/images/default_profile_photos/red_koala/300.png
index ee4a701d9..8eab5e4b8 100644
--- a/images/default_profile_photos/red_koala/300.png
+++ b/images/default_profile_photos/red_koala/300.png
Binary files differ
diff --git a/images/default_profile_photos/red_koala_trans/300.png b/images/default_profile_photos/red_koala_trans/300.png
index 4e51c80e2..a76b2fffe 100644
--- a/images/default_profile_photos/red_koala_trans/300.png
+++ b/images/default_profile_photos/red_koala_trans/300.png
Binary files differ
diff --git a/images/default_profile_photos/redmatrix_logo_smiley/300.png b/images/default_profile_photos/redmatrix_logo_smiley/300.png
index 7299c4494..d0b18ea80 100644
--- a/images/default_profile_photos/redmatrix_logo_smiley/300.png
+++ b/images/default_profile_photos/redmatrix_logo_smiley/300.png
Binary files differ